cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- long awaited update ImageMagick to 6.4.5-6

Browse Source 
- now includes perl modules, superseding graphics/p5-PerlMagick

feedback from ajacoutot@, kili@ and naddy@ (and bulk)

ok kili@
This commit is contained in:
okan 2008-11-20 13:29:56 +00:00
parent 470b1a772a
commit 3955871973
11 changed files with 980 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
graphics/ImageMagick/Makefile
View File

@ -1,14 +1,15 @@
# $OpenBSD: Makefile,v 1.101 2008/05/02 19:52:19 sthen Exp $
# $OpenBSD: Makefile,v 1.102 2008/11/20 13:29:56 okan Exp $
COMMENT= image processing tools
VER= 6.3.6
DASHVER= 10
VER= 6.4.5
DASHVER= 3
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}p0
SHARED_LIBS= Magick++ 12.1 \
Magick 12.1 \
Wand 12.1
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
CATEGORIES= graphics
@ -24,6 +25,7 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c jpeg m z
LIB_DEPENDS= bz2.>=10::archivers/bzip2 \
@ -35,60 +37,57 @@ LIB_DEPENDS= bz2.>=10::archivers/bzip2 \
RUN_DEPENDS= :netpbm-*:graphics/netpbm
BUILD_DEPENDS= :netpbm-*:graphics/netpbm
REGRESS_DEPENDS= :p5-PerlMagick-${VER}.${DASHVER}:graphics/p5-PerlMagick
USE_LIBTOOL= Yes
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.61
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --with-quantum-depth=16 \
--without-dot \
--without-dps \
--without-fpx \
--without-gvc \
--without-modules \
--without-openexr \
--without-threads \
--without-perl \
--with-perl=/usr/bin/perl \
--without-rsvg \
--with-ltdl-include=${LOCALBASE}/include \
--with-ltdl-lib=${LOCALBASE}/lib \
--disable-ltdl-install
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/libxml2 -I${LOCALBASE}/include" \
LDFLAGS="-L${WRKBUILD}/magick/.libs -L${WRKBUILD}/wand/.libs -L${LOCALBASE}/lib" \
LDFLAGS="-L${LOCALBASE}/lib" \
ac_cv_path_LaunchDelegate=no
FLAVORS= no_x11
FLAVOR?=
.if ${FLAVOR:L:Mno_x11}
BUILD_DEPENDS+= :ghostscript-*:print/ghostscript/gnu,no_x11
RUN_DEPENDS+= :ghostscript-*:print/ghostscript/gnu,no_x11
CONFIGURE_ARGS+= --without-x --without-ttf --without-freetype \
--without-wmf
BUILD_DEPENDS+= :ghostscript-*:print/ghostscript/gnu,no_x11
CONFIGURE_ENV+= ac_cv_path_FIGDecodeDelegate=no
CONFIGURE_ARGS+= --without-x \
--without-freetype \
--without-wmf
.else
BUILD_DEPENDS+= :ghostscript-*:print/ghostscript/gnu
RUN_DEPENDS+= :ghostscript-*:print/ghostscript/gnu
WANTLIB+= ICE SM X11 Xau Xdmcp Xext Xt expat fontconfig \
freetype iconv
USE_X11= Yes
RUN_DEPENDS+= :transfig-*:print/transfig
BUILD_DEPENDS+= :transfig-*:print/transfig
WANTLIB+= ICE SM X11 Xau Xdmcp Xext Xt expat fontconfig freetype iconv
CONFIGURE_ARGS+= --with-wmf
LIB_DEPENDS+= wmflite.>=7::graphics/libwmf \
xml2.>=9::textproc/libxml
RUN_DEPENDS+= :ghostscript-*:print/ghostscript/gnu
RUN_DEPENDS+= :transfig-*:print/transfig
BUILD_DEPENDS+= :ghostscript-*:print/ghostscript/gnu
BUILD_DEPENDS+= :transfig-*:print/transfig
CONFIGURE_ARGS+= --with-wmf
.endif
WRKDIST= ${WRKDIR}/${DISTNAME:S/-${DASHVER}$//}
post-extract:
@rm -f ${WRKDIST}/utilities/*.1
post-install:
@perl -pi -e s#'-L${WRKBUILD}/(magick|wand)/.libs '#''#g \
@perl -pi -e s,'-L${WRKBUILD}/(magick|wand)/.libs','',g \
${PREFIX}/bin/Magick-config
.for f in Magick++ Magick Wand
@perl -pi -e s#'-L${WRKBUILD}/(magick|wand)/.libs '#''#g \
.for f in Magick++ MagickCore MagickWand
@perl -pi -e s,'-L${WRKBUILD}/(magick|wand)/.libs','',g \
${PREFIX}/lib/lib${f}.la
.endfor

10
graphics/ImageMagick/distinfo
View File

@ -1,5 +1,5 @@
MD5 (ImageMagick-6.3.6-10.tar.gz) = mycQYgC9yHnQWDNVvIBS+g==
RMD160 (ImageMagick-6.3.6-10.tar.gz) = yy5MWV5nQ+s3i6O6Tb319ttiHPE=
SHA1 (ImageMagick-6.3.6-10.tar.gz) = a+X4sSW5Cq1YxNK9hvwEIgEIsS0=
SHA256 (ImageMagick-6.3.6-10.tar.gz) = Dfj2txKR0Y3DXdCXXW3+kOsmuOq57UB3MfM48INOde8=
SIZE (ImageMagick-6.3.6-10.tar.gz) = 9100940
MD5 (ImageMagick-6.4.5-3.tar.gz) = afyt6PX4FbnRuOaRRPbD7A==
RMD160 (ImageMagick-6.4.5-3.tar.gz) = p9O9L9yxFlq0+1t8f3jl9oNKMG8=
SHA1 (ImageMagick-6.4.5-3.tar.gz) = reF28ZZpVl5cLfiXtMR2ZrR/JHk=
SHA256 (ImageMagick-6.4.5-3.tar.gz) = SeR/baXWBGL1HJdUvr6LB6w6EJWYu0pYKtvJSpF3IxI=
SIZE (ImageMagick-6.4.5-3.tar.gz) = 11179682

12
graphics/ImageMagick/patches/patch-PerlMagick_Makefile_PL_in Normal file
View File

@ -0,0 +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
'INSTALLBIN' => '@BIN_DIR@',
# Library specification
- 'LIBS' => [ '-L@MAGICKCORE_PATH@ -L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand' ],
+ 'LIBS' => [ '-L@MAGICKCORE_PATH@ -lMagickCore -lMagickWand' ],
# Perl binary name (if a Perl binary is built)
'MAP_TARGET' => 'PerlMagick',

8
graphics/ImageMagick/patches/patch-coders_png_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-coders_png_c,v 1.5 2007/09/19 18:46:55 sthen Exp $
--- coders/png.c.orig Mon Sep 17 22:18:06 2007
+++ coders/png.c Mon Sep 17 22:18:35 2007
@@ -1763,7 +1763,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
$OpenBSD: patch-coders_png_c,v 1.6 2008/11/20 13:29:56 okan Exp $
--- coders/png.c.orig Sun Oct 12 13:38:07 2008
+++ coders/png.c Tue Oct 21 09:25:45 2008
@@ -1770,7 +1770,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
png_set_read_user_chunk_fn(ping, image, read_vpag_chunk_callback);
#endif

38
graphics/ImageMagick/patches/patch-configure Normal file
View File

@ -0,0 +1,38 @@
$OpenBSD: patch-configure,v 1.3 2008/11/20 13:29:56 okan Exp $
--- configure.orig Sat Nov 1 11:22:55 2008
+++ configure Mon Nov 3 11:59:44 2008
@@ -20807,6 +20807,7 @@ with_ltdl='no'
if test "$libtool_build_shared_libs" != 'no'; then
with_ltdl='yes'
fi
+with_ltdl='no'
if test "$with_ltdl" != 'no'; then
WITH_LTDL_TRUE=
@@ -42157,7 +42158,7 @@ fi
#
# Subdirectory under lib to place ImageMagick lib files
-LIBRARY_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
+LIBRARY_RELATIVE_PATH="${PACKAGE_NAME}"
cat >>confdefs.h <<_ACEOF
#define LIBRARY_RELATIVE_PATH "$LIBRARY_RELATIVE_PATH"
@@ -42261,7 +42262,7 @@ _ACEOF
#
# Path to ImageMagick documentation files
-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
+DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}"
DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}"
DEFINE_DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}/"
case "${build_os}" in
@@ -42278,7 +42279,7 @@ _ACEOF
#
# Path to ImageMagick share files
-SHARE_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
+SHARE_RELATIVE_PATH="${PACKAGE_NAME}"
SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}"
DEFINE_SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}/"
case "${build_os}" in

38
graphics/ImageMagick/patches/patch-configure_ac
View File

@ -1,38 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.8 2007/09/19 18:46:55 sthen Exp $
--- configure.ac.orig Tue Sep 11 20:19:52 2007
+++ configure.ac Mon Sep 17 23:14:21 2007
@@ -390,6 +390,7 @@ with_ltdl='no'
if test "$libtool_build_shared_libs" != 'no'; then
with_ltdl='yes'
fi
+with_ltdl='no'
AM_CONDITIONAL(WITH_LTDL, test "$with_ltdl" != 'no')
if test "$with_ltdl" != 'no'; then
@@ -2076,7 +2077,7 @@ AC_SUBST(PERLMAINCC)
#
# Subdirectory under lib to place ImageMagick lib files
-MagickLibSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
+MagickLibSubdir="${PACKAGE_NAME}"
AC_DEFINE_UNQUOTED(MagickLibSubdir,"$MagickLibSubdir",Subdirectory of lib where ImageMagick architecture dependent files are installed)
# Path to ImageMagick bin directory
@@ -2134,7 +2135,7 @@ AC_SUBST(MagickFilterModulesPath)
#
# Path to ImageMagick document files
-MagickDocumentSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
+MagickDocumentSubdir="${PACKAGE_NAME}"
MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}"
MagickDocumentPathDefine="${MagickDocumentPath}/"
if test "$native_win32_build" = 'yes'; then
@@ -2145,7 +2146,7 @@ AC_SUBST(MagickDocumentPath)
#
# Path to ImageMagick share files
-MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
+MagickShareSubdir="${PACKAGE_NAME}"
MagickSharePath="${DATA_DIR}/${MagickShareSubdir}"
MagickSharePathDefine="${MagickSharePath}/"
if test "$native_win32_build" = 'yes'; then

12
graphics/ImageMagick/patches/patch-magick_Magick-config_in Normal file
View File

@ -0,0 +1,12 @@
$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

61
graphics/ImageMagick/patches/patch-magick_signature_c
View File

@ -1,61 +0,0 @@
$OpenBSD: patch-magick_signature_c,v 1.5 2007/04/08 15:22:50 steven Exp $
--- magick/signature.c.orig Mon Jan 8 05:28:26 2007
+++ magick/signature.c Sun Apr 8 09:38:55 2007
@@ -366,8 +366,19 @@ static void TransformSignature(SignatureInfo *signatur
T2,
W[64];
+ unsigned int
+ uT;
+
shift=32;
p=signature_info->message;
+
+ /*
+ * The original code was incorrect on sparc64 (and other arches) in that it
+ * assumes that &signature_info->message is on the appropriate boundary
+ * to cast to an unsigned long. It isn't. It causes a bus error
+ * on sparc64. This code is not much better and assumes that an
+ * unsigned int is 4 bytes long. At least it doesn't get a bus error.
+ */
if (signature_info->lsb_first == MagickFalse)
{
if (sizeof(unsigned long) <= 4)
@@ -378,12 +389,11 @@ static void TransformSignature(SignatureInfo *signatur
W[i]=Trunc32(T);
}
else
- for (i=0; i < 16; i+=2)
+ for (i=0; i < 16; i++)
{
- T=(*((unsigned long *) p));
- p+=8;
- W[i]=Trunc32(T >> shift);
- W[i+1]=Trunc32(T);
+ uT=(*((unsigned int *) p));
+ p+=4;
+ W[i]=uT;
}
}
else
@@ -396,15 +406,12 @@ static void TransformSignature(SignatureInfo *signatur
((T >> 8) & 0x0000ff00) | ((T >> 24) & 0x000000ff);
}
else
- for (i=0; i < 16; i+=2)
+ for (i=0; i < 16; i++)
{
- T=(*((unsigned long *) p));
- p+=8;
- W[i]=((T << 24) & 0xff000000) | ((T << 8) & 0x00ff0000) |
- ((T >> 8) & 0x0000ff00) | ((T >> 24) & 0x000000ff);
- T>>=shift;
- W[i+1]=((T << 24) & 0xff000000) | ((T << 8) & 0x00ff0000) |
- ((T >> 8) & 0x0000ff00) | ((T >> 24) & 0x000000ff);
+ uT=(*((unsigned int *) p));
+ p+=4;
+ W[i]=((uT << 24) & 0xff000000) | ((uT << 8) & 0x00ff0000) |
+ ((uT >> 8) & 0x0000ff00) | ((uT >> 24) & 0x000000ff);
}
/*
Copy digest to registers.

8
graphics/ImageMagick/pkg/PFRAG.no-no_x11
View File

@ -1,7 +1,7 @@
@comment $OpenBSD: PFRAG.no-no_x11,v 1.2 2004/09/15 00:50:07 espie Exp $
bin/animate
bin/display
bin/import
@comment $OpenBSD: PFRAG.no-no_x11,v 1.3 2008/11/20 13:29:56 okan Exp $
@bin bin/animate
@bin bin/display
@bin bin/import
@man man/man1/animate.1
@man man/man1/display.1
@man man/man1/import.1

7
graphics/ImageMagick/pkg/PFRAG.shared
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.13 2005/12/28 14:56:54 steven Exp $
@comment $OpenBSD: PFRAG.shared,v 1.14 2008/11/20 13:29:56 okan Exp $
@lib lib/libMagick++.so.${LIBMagick++_VERSION}
@lib lib/libMagick.so.${LIBMagick_VERSION}
@lib lib/libWand.so.${LIBWand_VERSION}
@lib lib/libMagickCore.so.${LIBMagickCore_VERSION}
@lib lib/libMagickWand.so.${LIBMagickWand_VERSION}
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Image/Magick/Magick.so

1007
graphics/ImageMagick/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff