update to ImageMagick-6.2.0-8; Bernd Ahlers <b.ahlers@ba-net.org>
This commit is contained in:
pvalchev
parent
f93cecc2f6
commit
6522776b6d
@ -1,15 +1,16 @@
|
||||
# $OpenBSD: Makefile,v 1.78 2005/01/09 11:06:38 alek Exp $
|
||||
# $OpenBSD: Makefile,v 1.79 2005/03/31 04:23:42 pvalchev Exp $
|
||||
|
||||
COMMENT= "image processing tools"
|
||||
|
||||
VER= 6.0.0
|
||||
DASHVER= 2
|
||||
VER= 6.2.0
|
||||
DASHVER= 8
|
||||
DISTNAME= ImageMagick-${VER}-${DASHVER}
|
||||
PKGNAME= ${DISTNAME}p3
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=imagemagick/}
|
||||
|
||||
HOMEPAGE= http://www.simplesystems.org/ImageMagick/
|
||||
HOMEPAGE= http://www.imagemagick.org
|
||||
|
||||
MASTER_SITES= ${HOMEPAGE}/download/ \
|
||||
${MASTER_SITE_SOURCEFORGE:=imagemagick/}
|
||||
|
||||
LIB_DEPENDS+= bz2.10::archivers/bzip2 \
|
||||
jbig.1.2::graphics/jbigkit \
|
||||
@ -17,13 +18,15 @@ LIB_DEPENDS+= bz2.10::archivers/bzip2 \
|
||||
tiff.35::graphics/tiff \
|
||||
xml2.6::textproc/libxml \
|
||||
lcms::graphics/lcms \
|
||||
jasper::graphics/jasper
|
||||
jasper::graphics/jasper \
|
||||
ltdl::devel/libtool
|
||||
|
||||
RUN_DEPENDS ::graphics/mpeg-lib
|
||||
BUILD_DEPENDS= ${RUN_DEPENDS}
|
||||
|
||||
MAINTAINER= Brad Smith <brad@openbsd.org>
|
||||
|
||||
# http://www.imagemagick.org/www/Copyright.html
|
||||
# http://www.imagemagick.org/www/Copyright.html
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
@ -36,16 +39,16 @@ SEPARATE_BUILD= concurrent
|
||||
CONFIGURE_STYLE= autoconf
|
||||
AUTOCONF_VERSION= 2.59
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
CONFIGURE_ARGS+= --enable-lzw \
|
||||
--with-quantum-depth=16 \
|
||||
CONFIGURE_ARGS+= --with-quantum-depth=16 \
|
||||
--without-dot \
|
||||
--without-dps \
|
||||
--without-fpx \
|
||||
--without-hdf \
|
||||
--without-modules \
|
||||
--without-threads \
|
||||
--without-perl \
|
||||
--without-wmf
|
||||
--without-wmf \
|
||||
--disable-ltdl-install
|
||||
|
||||
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/libxml2 -I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${WRKBUILD}/magick/.libs -L${LOCALBASE}/lib" \
|
||||
ac_cv_path_LaunchDelegate=no
|
||||
@ -64,13 +67,30 @@ RUN_DEPENDS+= :ghostscript-*:print/ghostscript/gnu
|
||||
USE_X11= Yes
|
||||
RUN_DEPENDS+= :transfig-*:print/transfig
|
||||
BUILD_DEPENDS+= :transfig-*:print/transfig
|
||||
WANTLIB+= ICE SM X11 Xext freetype
|
||||
WANTLIB+= ICE SM X11 Xext Xt freetype
|
||||
.endif
|
||||
|
||||
RUN_DEPENDS+= :netpbm-*:graphics/netpbm
|
||||
BUILD_DEPENDS+= :netpbm-*:graphics/netpbm
|
||||
|
||||
WRKDIST= ${WRKDIR}/${DISTNAME:S/-${DASHVER}//}
|
||||
WRKDIST= ${WRKDIR}/${DISTNAME:S/-${DASHVER}$//}
|
||||
|
||||
pre-configure:
|
||||
@if pkg dependencies check ImageMagick-\*; then \
|
||||
if pkg dependencies check ${DISTNAME}; then \
|
||||
:; \
|
||||
else \
|
||||
echo 1>&2 "+-------------------"; \
|
||||
echo 1>&2 "| Error: you must remove the existing ImageMagick installation"; \
|
||||
echo 1>&2 "| before compiling this version. To fully remove run"; \
|
||||
echo 1>&2 "| these commands as user root"; \
|
||||
echo 1>&2 "|"; \
|
||||
echo 1>&2 "| pkg_delete `pkg_info -e 'ImageMagick-*'`"; \
|
||||
echo 1>&2 "|"; \
|
||||
echo 1>&2 "+-------------------"; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
fi
|
||||
|
||||
post-install:
|
||||
@perl -pi -e s#'-L${WRKBUILD}/magick/.libs '#''#g \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MD5 (ImageMagick-6.0.0-2.tar.gz) = ddeda7273881f9ced3ff258b5e739c19
|
||||
RMD160 (ImageMagick-6.0.0-2.tar.gz) = 50ad018b112feda7fa2b3a9f14a9a98e450d7f98
|
||||
SHA1 (ImageMagick-6.0.0-2.tar.gz) = ca91f174ea5264cadbf10a64d7e541dff9c8e59f
|
||||
SIZE (ImageMagick-6.0.0-2.tar.gz) = 6687901
|
||||
MD5 (ImageMagick-6.2.0-8.tar.gz) = ef7619eeffb657cf454e16e690933131
|
||||
RMD160 (ImageMagick-6.2.0-8.tar.gz) = e820ea28532c31d05064fe55200489d8e97e17ff
|
||||
SHA1 (ImageMagick-6.2.0-8.tar.gz) = d06f68ea6820bf32a57e25388a3f56016a4a4826
|
||||
SIZE (ImageMagick-6.2.0-8.tar.gz) = 5665455
|
||||
|
||||
12
graphics/ImageMagick/patches/patch-Makefile_in
Normal file
12
graphics/ImageMagick/patches/patch-Makefile_in
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.1 2005/03/31 04:23:42 pvalchev Exp $
|
||||
--- Makefile.in.orig Sat Jan 22 16:41:08 2005
|
||||
+++ Makefile.in Sat Jan 22 16:41:08 2005
|
||||
@@ -1888,7 +1888,7 @@ EXTRA_DIST = \
|
||||
$(UTILITIES_EXTRA_DIST) \
|
||||
$(WAND_EXTRA_DIST)
|
||||
|
||||
-lib_LTLIBRARIES = $(LIBLTDL) $(LIBMAGICK) $(LIBWAND) $(LIBMAGICKPP)
|
||||
+lib_LTLIBRARIES = $(LIBMAGICK) $(LIBWAND) $(LIBMAGICKPP)
|
||||
|
||||
# Where architecture-independent configuration files get installed
|
||||
# (share/ImageMagick-version)
|
||||
@ -1,78 +0,0 @@
|
||||
$OpenBSD: patch-aclocal_m4,v 1.2 2004/08/13 06:16:38 brad Exp $
|
||||
--- aclocal.m4.orig Sat Apr 3 14:37:34 2004
|
||||
+++ aclocal.m4 Thu Aug 12 22:49:17 2004
|
||||
@@ -1670,6 +1670,19 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
|
||||
lt_cv_sys_max_cmd_len=8192;
|
||||
;;
|
||||
|
||||
+ netbsd* | freebsd* | openbsd* | darwin* )
|
||||
+ # This has been around since 386BSD, at least. Likely further.
|
||||
+ if test -x /sbin/sysctl; then
|
||||
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
|
||||
+ elif test -x /usr/sbin/sysctl; then
|
||||
+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
|
||||
+ else
|
||||
+ lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
|
||||
+ fi
|
||||
+ # And add a safety zone
|
||||
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
|
||||
+ ;;
|
||||
+
|
||||
*)
|
||||
# If test is not a shell built-in, we'll probably end up computing a
|
||||
# maximum length that is only half of the actual maximum length, but
|
||||
@@ -2500,7 +2513,7 @@ nto-qnx*)
|
||||
openbsd*)
|
||||
version_type=sunos
|
||||
need_lib_prefix=no
|
||||
- need_version=yes
|
||||
+ need_version=no
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
@@ -3208,12 +3221,10 @@ nto-qnx*)
|
||||
;;
|
||||
|
||||
openbsd*)
|
||||
- lt_cv_file_magic_cmd=/usr/bin/file
|
||||
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
|
||||
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
|
||||
else
|
||||
- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
|
||||
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
|
||||
fi
|
||||
;;
|
||||
|
||||
@@ -4194,6 +4205,22 @@ case $host_os in
|
||||
# Workaround some broken pre-1.5 toolchains
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
|
||||
;;
|
||||
+ openbsd2*)
|
||||
+ # C++ shared libraries are fairly broken
|
||||
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||
+ ;;
|
||||
+ openbsd*)
|
||||
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
|
||||
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
|
||||
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
||||
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
||||
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
|
||||
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
||||
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
||||
+ fi
|
||||
+ output_verbose_link_cmd='echo'
|
||||
+ ;;
|
||||
osf3*)
|
||||
case $cc_basename in
|
||||
KCC)
|
||||
@@ -6554,6 +6581,7 @@ $echo "local: *; };" >> $output_objdir/$
|
||||
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
|
||||
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
||||
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
||||
else
|
||||
@ -1,82 +0,0 @@
|
||||
$OpenBSD: patch-coders_bmp_c,v 1.1 2004/09/21 18:39:15 brad Exp $
|
||||
--- coders/bmp.c.orig Fri Apr 9 19:13:24 2004
|
||||
+++ coders/bmp.c Tue Sep 21 04:05:37 2004
|
||||
@@ -178,6 +178,7 @@ static unsigned int DecodeImage(Image *i
|
||||
x;
|
||||
|
||||
register unsigned char
|
||||
+ *p,
|
||||
*q;
|
||||
|
||||
unsigned char
|
||||
@@ -191,9 +192,12 @@ static unsigned int DecodeImage(Image *i
|
||||
(void) ResetMagickMemory(pixels,0,(size_t) image->columns*image->rows);
|
||||
byte=0;
|
||||
x=0;
|
||||
- q=pixels;
|
||||
+ p=pixels;
|
||||
+ q=pixels+(size_t) image->columns*image->rows;
|
||||
for (y=0; y < (long) image->rows; )
|
||||
{
|
||||
+ if ((p < pixels) || (p >= q))
|
||||
+ break;
|
||||
count=ReadBlobByte(image);
|
||||
if (count == EOF)
|
||||
break;
|
||||
@@ -202,16 +206,17 @@ static unsigned int DecodeImage(Image *i
|
||||
/*
|
||||
Encoded mode.
|
||||
*/
|
||||
+ count=Min(count,q-p);
|
||||
byte=(unsigned char) ReadBlobByte(image);
|
||||
if (compression == BI_RLE8)
|
||||
{
|
||||
for (i=count; i != 0; i--)
|
||||
- *q++=(unsigned char) byte;
|
||||
+ *p++=(unsigned char) byte;
|
||||
}
|
||||
else
|
||||
{
|
||||
for (i=0; i < count; i++)
|
||||
- *q++=(unsigned char)
|
||||
+ *p++=(unsigned char)
|
||||
((i & 0x01) != 0 ? (byte & 0x0f) : ((byte >> 4) & 0x0f));
|
||||
}
|
||||
x+=count;
|
||||
@@ -233,7 +238,7 @@ static unsigned int DecodeImage(Image *i
|
||||
*/
|
||||
x=0;
|
||||
y++;
|
||||
- q=pixels+y*image->columns;
|
||||
+ p=pixels+y*image->columns;
|
||||
break;
|
||||
}
|
||||
case 0x02:
|
||||
@@ -243,7 +248,7 @@ static unsigned int DecodeImage(Image *i
|
||||
*/
|
||||
x+=ReadBlobByte(image);
|
||||
y+=ReadBlobByte(image);
|
||||
- q=pixels+y*image->columns+x;
|
||||
+ p=pixels+y*image->columns+x;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
@@ -251,15 +256,16 @@ static unsigned int DecodeImage(Image *i
|
||||
/*
|
||||
Absolute mode.
|
||||
*/
|
||||
+ count=Min(count,q-p);
|
||||
if (compression == BI_RLE8)
|
||||
for (i=(long) count; i != 0; --i)
|
||||
- *q++=(unsigned char) ReadBlobByte(image);
|
||||
+ *p++=(unsigned char) ReadBlobByte(image);
|
||||
else
|
||||
for (i=0; i < count; i++)
|
||||
{
|
||||
if ((i & 0x01) == 0)
|
||||
byte=(unsigned char) ReadBlobByte(image);
|
||||
- *q++=(unsigned char)
|
||||
+ *p++=(unsigned char)
|
||||
((i & 0x01) != 0 ? (byte & 0x0f) : ((byte >> 4) & 0x0f));
|
||||
}
|
||||
x+=count;
|
||||
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-coders_gif_c,v 1.1 2004/09/21 18:39:15 brad Exp $
|
||||
--- coders/gif.c.orig Tue Sep 21 03:42:27 2004
|
||||
+++ coders/gif.c Tue Sep 21 03:43:39 2004
|
||||
@@ -261,6 +261,8 @@ static unsigned int DecodeImage(Image *i
|
||||
}
|
||||
while (code >= clear)
|
||||
{
|
||||
+ if ((top_stack-pixel_stack) >= MaxStackSize)
|
||||
+ break;
|
||||
*top_stack++=suffix[code];
|
||||
code=(unsigned long) prefix[code];
|
||||
}
|
||||
@@ -268,6 +270,8 @@ static unsigned int DecodeImage(Image *i
|
||||
/*
|
||||
Add a new string to the string table,
|
||||
*/
|
||||
+ if ((top_stack-pixel_stack) >= MaxStackSize)
|
||||
+ break;
|
||||
if (available >= MaxStackSize)
|
||||
break;
|
||||
*top_stack++=(unsigned char) first;
|
||||
@ -1,64 +0,0 @@
|
||||
$OpenBSD: patch-coders_png_c,v 1.1 2004/08/13 06:17:41 brad Exp $
|
||||
--- coders/png.c.orig Thu Aug 12 22:54:19 2004
|
||||
+++ coders/png.c Thu Aug 12 23:04:05 2004
|
||||
@@ -1372,6 +1372,8 @@ static void PNGErrorHandler(png_struct *
|
||||
Image
|
||||
*image;
|
||||
|
||||
+ if (LocaleCompare(message, "Missing PLTE before tRNS") == 0)
|
||||
+ png_error(ping, message);
|
||||
image=(Image *) png_get_error_ptr(ping);
|
||||
if (image->debug != False)
|
||||
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
|
||||
@@ -1600,6 +1602,20 @@ static Image *ReadOnePNGImage(MngInfo *m
|
||||
length,
|
||||
row_offset;
|
||||
|
||||
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
|
||||
+ png_byte unused_chunks[]=
|
||||
+ {
|
||||
+ 104, 73, 83, 84, '\0', /* hIST */
|
||||
+ 105, 84, 88, 116, '\0', /* iTXt */
|
||||
+ 112, 67, 65, 76, '\0', /* pCAL */
|
||||
+ 115, 67, 65, 76, '\0', /* sCAL */
|
||||
+ 115, 80, 76, 84, '\0', /* sPLT */
|
||||
+ 116, 69, 88, 116, '\0', /* tEXt */
|
||||
+ 116, 73, 77, 69, '\0', /* tIME */
|
||||
+ 122, 84, 88, 116, '\0', /* zTXt */
|
||||
+ };
|
||||
+#endif
|
||||
+
|
||||
logging=LogMagickEvent(CoderEvent,GetMagickModule(),
|
||||
" enter ReadOnePNGImage()");
|
||||
|
||||
@@ -1685,6 +1701,12 @@ static Image *ReadOnePNGImage(MngInfo *m
|
||||
else
|
||||
png_set_read_fn(ping,image,png_get_data);
|
||||
|
||||
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
|
||||
+ /* Ignore unused chunks */
|
||||
+ png_set_keep_unknown_chunks(ping, 0, unused_chunks,
|
||||
+ (int)sizeof(unused_chunks)/5);
|
||||
+#endif
|
||||
+
|
||||
#if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) \
|
||||
&& (PNG_LIBPNG_VER >= 10200)
|
||||
/* Disable thread-unsafe features of pnggccrd */
|
||||
@@ -2551,7 +2573,7 @@ static Image *ReadOnePNGImage(MngInfo *m
|
||||
*value;
|
||||
|
||||
length=text[i].text_length;
|
||||
- value=(char *) AcquireMagickMemory(length+1);
|
||||
+ value=(char *) AcquireMagickMemory(length+MaxTextExtent);
|
||||
if (value == (char *) NULL)
|
||||
{
|
||||
(void) ThrowMagickException(&image->exception,GetMagickModule(),
|
||||
@@ -2623,6 +2645,8 @@ static Image *ReadOnePNGImage(MngInfo *m
|
||||
image->filename);
|
||||
png_get_IHDR(ping,ping_info,&width,&height,&bit_depth,&color_type,
|
||||
&interlace_method,&compression_method,&filter_method);
|
||||
+ if (width > 250000L || height > 250000L)
|
||||
+ png_error(ping,"PNG Image dimensions are too large.");
|
||||
mng_info->ob[object_id]->width=width;
|
||||
mng_info->ob[object_id]->height=height;
|
||||
mng_info->ob[object_id]->color_type=color_type;
|
||||
40
graphics/ImageMagick/patches/patch-ltdl_Makefile_am
Normal file
40
graphics/ImageMagick/patches/patch-ltdl_Makefile_am
Normal file
@ -0,0 +1,40 @@
|
||||
$OpenBSD: patch-ltdl_Makefile_am,v 1.1 2005/03/31 04:23:42 pvalchev Exp $
|
||||
--- ltdl/Makefile.am.orig Wed Feb 9 12:29:44 2005
|
||||
+++ ltdl/Makefile.am Wed Feb 9 12:32:11 2005
|
||||
@@ -15,11 +15,11 @@
|
||||
# Makefile for building libltdl.
|
||||
|
||||
LTDL_HDRS = \
|
||||
- ltdl/ltdl.h
|
||||
+ /usr/local/share/libtool/libltdl/ltdl.h
|
||||
|
||||
LTDL_SRCS = \
|
||||
- ltdl/ltdl.c \
|
||||
- ltdl/ltdl.h
|
||||
+ /usr/local/share/libtool/libltdl/ltdl.c \
|
||||
+ /usr/local/share/libtool/libltdl/ltdl.h
|
||||
|
||||
#if WITH_LTDL
|
||||
#LIB_LTDL=$(LIBLTDL)
|
||||
@@ -28,18 +28,14 @@ LTDL_SRCS = \
|
||||
#endif
|
||||
|
||||
if WITH_LTDL
|
||||
- LIBLTDL=ltdl/libltdl.la
|
||||
-if INSTALL_LTDL
|
||||
- LTDL_INSTALLHEADERS = $(LTDL_HDRS)
|
||||
-else
|
||||
+ LIBLTDL=/usr/local/lib/libltdl.la
|
||||
LTDL_NOINST_HDRS = $(LTDL_HDRS)
|
||||
-endif # INSTALL_LTDL
|
||||
else
|
||||
LIBLTDL=
|
||||
endif # WITH_LTDL
|
||||
|
||||
-LTDL_CLEANFILES = \
|
||||
- ltdl/libltdl.la
|
||||
+LTDL_CLEANFILES =
|
||||
+
|
||||
|
||||
ltdl_libltdl_la_SOURCES = $(LTDL_SRCS)
|
||||
ltdl_libltdl_la_LDFLAGS = -no-undefined -version-info 4:0:1
|
||||
@ -1,29 +1,7 @@
|
||||
$OpenBSD: patch-ltmain_sh,v 1.9 2004/08/13 06:16:38 brad Exp $
|
||||
--- ltmain.sh.orig Fri May 21 10:59:35 2004
|
||||
+++ ltmain.sh Tue Aug 10 13:42:50 2004
|
||||
@@ -2151,10 +2151,17 @@ EOF
|
||||
absdir="$libdir"
|
||||
fi
|
||||
else
|
||||
- dir="$ladir/$objdir"
|
||||
- absdir="$abs_ladir/$objdir"
|
||||
- # Remove this search path later
|
||||
- notinst_path="$notinst_path $abs_ladir"
|
||||
+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
|
||||
+ dir="$ladir"
|
||||
+ absdir="$abs_ladir"
|
||||
+ # Remove this search path later
|
||||
+ notinst_path="$notinst_path $abs_ladir"
|
||||
+ else
|
||||
+ dir="$ladir/$objdir"
|
||||
+ absdir="$abs_ladir/$objdir"
|
||||
+ # Remove this search path later
|
||||
+ notinst_path="$notinst_path $abs_ladir"
|
||||
+ fi
|
||||
fi # $installed = yes
|
||||
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
|
||||
|
||||
@@ -2468,7 +2475,7 @@ EOF
|
||||
$OpenBSD: patch-ltmain_sh,v 1.10 2005/03/31 04:23:42 pvalchev Exp $
|
||||
--- ltmain.sh.orig Tue Jan 18 14:03:20 2005
|
||||
+++ ltmain.sh Tue Jan 18 14:05:20 2005
|
||||
@@ -2611,7 +2611,7 @@ EOF
|
||||
add_dir=
|
||||
add=
|
||||
# Finalize command for both is simple: just hardcode it.
|
||||
@ -32,7 +10,7 @@ $OpenBSD: patch-ltmain_sh,v 1.9 2004/08/13 06:16:38 brad Exp $
|
||||
add="$libdir/$linklib"
|
||||
elif test "$hardcode_minus_L" = yes; then
|
||||
add_dir="-L$libdir"
|
||||
@@ -5824,40 +5831,6 @@ relink_command=\"$relink_command\""
|
||||
@@ -5804,40 +5804,6 @@ relink_command=\"$relink_command\""
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit $EXIT_SUCCESS
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-magick_signature_c,v 1.1 2004/11/13 20:14:18 marc Exp $
|
||||
--- magick/signature.c.orig Sat Mar 20 08:25:06 2004
|
||||
+++ magick/signature.c Thu Nov 11 13:13:09 2004
|
||||
@@ -367,8 +367,19 @@ static void TransformSignature(Signature
|
||||
$OpenBSD: patch-magick_signature_c,v 1.2 2005/03/31 04:23:42 pvalchev Exp $
|
||||
--- magick/signature.c.orig Tue Jan 18 14:07:40 2005
|
||||
+++ magick/signature.c Tue Jan 18 14:12:25 2005
|
||||
@@ -368,8 +368,19 @@ static void TransformSignature(Signature
|
||||
T2,
|
||||
W[64];
|
||||
|
||||
@ -18,10 +18,10 @@ $OpenBSD: patch-magick_signature_c,v 1.1 2004/11/13 20:14:18 marc Exp $
|
||||
+ * 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 == False)
|
||||
if (signature_info->lsb_first == MagickFalse)
|
||||
{
|
||||
if (sizeof(unsigned long) <= 4)
|
||||
@@ -379,12 +390,11 @@ static void TransformSignature(Signature
|
||||
@@ -380,12 +391,11 @@ static void TransformSignature(Signature
|
||||
W[i]=Trunc32(T);
|
||||
}
|
||||
else
|
||||
@ -32,13 +32,13 @@ $OpenBSD: patch-magick_signature_c,v 1.1 2004/11/13 20:14:18 marc Exp $
|
||||
- p+=8;
|
||||
- W[i]=Trunc32(T >> shift);
|
||||
- W[i+1]=Trunc32(T);
|
||||
+ uT=(*((unsigned int *) p));
|
||||
+ p+=4;
|
||||
+ W[i]=uT;
|
||||
+ uT=(*((unsigned int *) p));
|
||||
+ p+=4;
|
||||
+ W[i]=uT;
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -397,15 +407,12 @@ static void TransformSignature(Signature
|
||||
@@ -398,15 +408,12 @@ static void TransformSignature(Signature
|
||||
((T >> 8) & 0x0000ff00) | ((T >> 24) & 0x000000ff);
|
||||
}
|
||||
else
|
||||
@ -52,10 +52,10 @@ $OpenBSD: patch-magick_signature_c,v 1.1 2004/11/13 20:14:18 marc Exp $
|
||||
- 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);
|
||||
+ uT=(*((unsigned int *) p));
|
||||
+ p+=4;
|
||||
+ W[i]=((uT << 24) & 0xff000000) | ((uT << 8) & 0x00ff0000) |
|
||||
+ ((uT >> 8) & 0x0000ff00) | ((uT >> 24) & 0x000000ff);
|
||||
}
|
||||
/*
|
||||
Copy digest to registers.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
ImageMagick is an X11 package for display and interactive manipulation
|
||||
of images. The package includes tools for image conversion, annotation,
|
||||
composition, animation, and creating montages. ImageMagick can read and
|
||||
compositing, animation, and creating montages. ImageMagick can read and
|
||||
write many of the more popular image formats (e.g. JPEG, TIFF, PNM, XPM,
|
||||
Photo CD, etc.).
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.9 2004/09/15 00:50:07 espie Exp $
|
||||
@lib lib/libMagick++.so.6.1
|
||||
@lib lib/libMagick.so.6.1
|
||||
@lib lib/libWand.so.6.1
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.10 2005/03/31 04:23:42 pvalchev Exp $
|
||||
@lib lib/libMagick++.so.8.0
|
||||
@lib lib/libMagick.so.8.0
|
||||
@lib lib/libWand.so.8.0
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.28 2004/10/19 00:38:06 espie Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.29 2005/03/31 04:23:42 pvalchev Exp $
|
||||
bin/Magick++-config
|
||||
bin/Magick-config
|
||||
bin/Wand-config
|
||||
@ -26,12 +26,13 @@ include/Magick++/TypeMetric.h
|
||||
include/magick/
|
||||
include/magick/ImageMagick.h
|
||||
include/magick/PreRvIcccm.h
|
||||
include/magick/animate.h
|
||||
include/magick/annotate.h
|
||||
include/magick/api.h
|
||||
include/magick/attribute.h
|
||||
include/magick/blob.h
|
||||
include/magick/cache-view.h
|
||||
include/magick/cache.h
|
||||
include/magick/cache_view.h
|
||||
include/magick/client.h
|
||||
include/magick/coder.h
|
||||
include/magick/color.h
|
||||
@ -46,10 +47,11 @@ include/magick/convert.h
|
||||
include/magick/decorate.h
|
||||
include/magick/delegate.h
|
||||
include/magick/deprecate.h
|
||||
include/magick/display.h
|
||||
include/magick/draw.h
|
||||
include/magick/effect.h
|
||||
include/magick/enhance.h
|
||||
include/magick/error.h
|
||||
include/magick/exception.h
|
||||
include/magick/fx.h
|
||||
include/magick/gem.h
|
||||
include/magick/geometry.h
|
||||
@ -61,8 +63,8 @@ include/magick/list.h
|
||||
include/magick/locale_.h
|
||||
include/magick/log.h
|
||||
include/magick/magic.h
|
||||
include/magick/magick-config.h
|
||||
include/magick/magick.h
|
||||
include/magick/magick_config.h
|
||||
include/magick/memory_.h
|
||||
include/magick/methods.h
|
||||
include/magick/module.h
|
||||
@ -71,15 +73,18 @@ include/magick/monitor.h
|
||||
include/magick/montage.h
|
||||
include/magick/option.h
|
||||
include/magick/paint.h
|
||||
include/magick/pixel.h
|
||||
include/magick/profile.h
|
||||
include/magick/quantize.h
|
||||
include/magick/random.h
|
||||
include/magick/random_.h
|
||||
include/magick/registry.h
|
||||
include/magick/resize.h
|
||||
include/magick/resource.h
|
||||
include/magick/resource_.h
|
||||
include/magick/segment.h
|
||||
include/magick/semaphore.h
|
||||
include/magick/shear.h
|
||||
include/magick/signature.h
|
||||
include/magick/splay-tree.h
|
||||
include/magick/stream.h
|
||||
include/magick/string_.h
|
||||
include/magick/timer.h
|
||||
@ -88,23 +93,25 @@ include/magick/transform.h
|
||||
include/magick/type.h
|
||||
include/magick/utility.h
|
||||
include/magick/version.h
|
||||
include/magick/widget.h
|
||||
include/magick/xwindow.h
|
||||
include/wand/
|
||||
include/wand/drawing_wand.h
|
||||
include/wand/drawing-wand.h
|
||||
include/wand/magick-wand.h
|
||||
include/wand/magick_wand.h
|
||||
include/wand/pixel_iterator.h
|
||||
include/wand/pixel_wand.h
|
||||
include/wand/pixel-iterator.h
|
||||
include/wand/pixel-wand.h
|
||||
lib/ImageMagick-${VER}/
|
||||
lib/ImageMagick-${VER}/config/
|
||||
lib/ImageMagick-${VER}/config/colors.mgk
|
||||
lib/ImageMagick-${VER}/config/configure.mgk
|
||||
lib/ImageMagick-${VER}/config/delegates.mgk
|
||||
lib/ImageMagick-${VER}/config/english.mgk
|
||||
lib/ImageMagick-${VER}/config/locale.mgk
|
||||
lib/ImageMagick-${VER}/config/type-ghostscript.mgk
|
||||
lib/ImageMagick-${VER}/config/type-solaris.mgk
|
||||
lib/ImageMagick-${VER}/config/type-windows.mgk
|
||||
lib/ImageMagick-${VER}/config/type.mgk
|
||||
lib/ImageMagick-${VER}/config/colors.xml
|
||||
lib/ImageMagick-${VER}/config/configure.xml
|
||||
lib/ImageMagick-${VER}/config/delegates.xml
|
||||
lib/ImageMagick-${VER}/config/english.xml
|
||||
lib/ImageMagick-${VER}/config/locale.xml
|
||||
lib/ImageMagick-${VER}/config/type-ghostscript.xml
|
||||
lib/ImageMagick-${VER}/config/type-solaris.xml
|
||||
lib/ImageMagick-${VER}/config/type-windows.xml
|
||||
lib/ImageMagick-${VER}/config/type.xml
|
||||
@comment lib/ImageMagick-${VER}/modules-Q16/
|
||||
@comment lib/ImageMagick-${VER}/modules-Q16/coders/
|
||||
@comment lib/ImageMagick-${VER}/modules-Q16/filters/
|
||||
@ -131,18 +138,18 @@ lib/pkgconfig/Wand.pc
|
||||
@man man/man1/montage.1
|
||||
@man man/man4/miff.4
|
||||
@man man/man5/quantize.5
|
||||
@comment share/ImageMagick/
|
||||
share/ImageMagick-${VER}/
|
||||
share/ImageMagick-${VER}/ChangeLog
|
||||
share/ImageMagick-${VER}/LICENSE
|
||||
share/ImageMagick-${VER}/Magick.pdf
|
||||
share/ImageMagick-${VER}/NOTICE
|
||||
share/ImageMagick-${VER}/QuickStart.txt
|
||||
share/ImageMagick-${VER}/NEWS
|
||||
share/ImageMagick-${VER}/config/
|
||||
share/ImageMagick-${VER}/config/coder.mgk
|
||||
share/ImageMagick-${VER}/config/log.mgk
|
||||
share/ImageMagick-${VER}/config/magic.mgk
|
||||
share/ImageMagick-${VER}/config/coder.xml
|
||||
share/ImageMagick-${VER}/config/log.xml
|
||||
share/ImageMagick-${VER}/config/magic.xml
|
||||
share/ImageMagick-${VER}/images/
|
||||
share/ImageMagick-${VER}/images/ImageMagick.jpg
|
||||
share/ImageMagick-${VER}/images/background.gif
|
||||
share/ImageMagick-${VER}/images/devlib.gif
|
||||
share/ImageMagick-${VER}/images/dogwaffle.png
|
||||
share/ImageMagick-${VER}/images/examples.jpg
|
||||
share/ImageMagick-${VER}/images/granite.png
|
||||
@ -150,58 +157,8 @@ share/ImageMagick-${VER}/images/logo.png
|
||||
share/ImageMagick-${VER}/images/magick-icon.png
|
||||
share/ImageMagick-${VER}/images/magick.png
|
||||
share/ImageMagick-${VER}/images/networkeleven.png
|
||||
share/ImageMagick-${VER}/images/networkredux.png
|
||||
share/ImageMagick-${VER}/images/pair.png
|
||||
share/ImageMagick-${VER}/images/patterns/
|
||||
share/ImageMagick-${VER}/images/patterns/bricks.png
|
||||
share/ImageMagick-${VER}/images/patterns/checkerboard.png
|
||||
share/ImageMagick-${VER}/images/patterns/circles.png
|
||||
share/ImageMagick-${VER}/images/patterns/crosshatch.png
|
||||
share/ImageMagick-${VER}/images/patterns/crosshatch30.png
|
||||
share/ImageMagick-${VER}/images/patterns/crosshatch45.png
|
||||
share/ImageMagick-${VER}/images/patterns/fishscales.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray0.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray10.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray100.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray15.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray20.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray25.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray30.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray35.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray40.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray45.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray5.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray50.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray55.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray60.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray65.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray70.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray75.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray80.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray85.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray90.png
|
||||
share/ImageMagick-${VER}/images/patterns/gray95.png
|
||||
share/ImageMagick-${VER}/images/patterns/hexagons.png
|
||||
share/ImageMagick-${VER}/images/patterns/horizontal.png
|
||||
share/ImageMagick-${VER}/images/patterns/horizontalsaw.png
|
||||
share/ImageMagick-${VER}/images/patterns/hs_bdiagonal.png
|
||||
share/ImageMagick-${VER}/images/patterns/hs_cross.png
|
||||
share/ImageMagick-${VER}/images/patterns/hs_diagcross.png
|
||||
share/ImageMagick-${VER}/images/patterns/hs_fdiagonal.png
|
||||
share/ImageMagick-${VER}/images/patterns/hs_horizontal.png
|
||||
share/ImageMagick-${VER}/images/patterns/hs_vertical.png
|
||||
share/ImageMagick-${VER}/images/patterns/left30.png
|
||||
share/ImageMagick-${VER}/images/patterns/left45.png
|
||||
share/ImageMagick-${VER}/images/patterns/leftshingle.png
|
||||
share/ImageMagick-${VER}/images/patterns/octagons.png
|
||||
share/ImageMagick-${VER}/images/patterns/right30.png
|
||||
share/ImageMagick-${VER}/images/patterns/right45.png
|
||||
share/ImageMagick-${VER}/images/patterns/rightshingle.png
|
||||
share/ImageMagick-${VER}/images/patterns/smallfishscales.png
|
||||
share/ImageMagick-${VER}/images/patterns/vertical.png
|
||||
share/ImageMagick-${VER}/images/patterns/verticalbricks.png
|
||||
share/ImageMagick-${VER}/images/patterns/verticalleftshingle.png
|
||||
share/ImageMagick-${VER}/images/patterns/verticalrightshingle.png
|
||||
share/ImageMagick-${VER}/images/patterns/verticalsaw.png
|
||||
share/ImageMagick-${VER}/images/promote.png
|
||||
share/ImageMagick-${VER}/images/right_triangle.png
|
||||
share/ImageMagick-${VER}/images/right_triangle_option.png
|
||||
@ -211,6 +168,7 @@ share/ImageMagick-${VER}/images/script.gif
|
||||
share/ImageMagick-${VER}/images/sprite.png
|
||||
share/ImageMagick-${VER}/images/star.gif
|
||||
share/ImageMagick-${VER}/images/top.gif
|
||||
share/ImageMagick-${VER}/images/travelsur.gif
|
||||
share/ImageMagick-${VER}/images/twi.png
|
||||
share/ImageMagick-${VER}/index.html
|
||||
share/ImageMagick-${VER}/www/
|
||||
@ -264,6 +222,7 @@ share/ImageMagick-${VER}/www/Magick++/thumbnail-anatomy-plain.jpg
|
||||
share/ImageMagick-${VER}/www/Magick++/thumbnail-sample-framed.jpg
|
||||
share/ImageMagick-${VER}/www/Magick++/thumbnail-sample-plain.jpg
|
||||
share/ImageMagick-${VER}/www/News.html
|
||||
share/ImageMagick-${VER}/www/Notice.html
|
||||
share/ImageMagick-${VER}/www/QuickStart.html
|
||||
share/ImageMagick-${VER}/www/README.html
|
||||
share/ImageMagick-${VER}/www/animate.html
|
||||
@ -273,31 +232,32 @@ share/ImageMagick-${VER}/www/api/animate.html
|
||||
share/ImageMagick-${VER}/www/api/annotate.html
|
||||
share/ImageMagick-${VER}/www/api/attribute.html
|
||||
share/ImageMagick-${VER}/www/api/blob.html
|
||||
share/ImageMagick-${VER}/www/api/cache-view.html
|
||||
share/ImageMagick-${VER}/www/api/cache.html
|
||||
share/ImageMagick-${VER}/www/api/cache_view.html
|
||||
share/ImageMagick-${VER}/www/api/color.html
|
||||
share/ImageMagick-${VER}/www/api/colorspace.html
|
||||
share/ImageMagick-${VER}/www/api/compare.html
|
||||
share/ImageMagick-${VER}/www/api/composite.html
|
||||
share/ImageMagick-${VER}/www/api/constitute.html
|
||||
share/ImageMagick-${VER}/www/api/decorate.html
|
||||
share/ImageMagick-${VER}/www/api/deprecate.html
|
||||
share/ImageMagick-${VER}/www/api/display.html
|
||||
share/ImageMagick-${VER}/www/api/draw.html
|
||||
share/ImageMagick-${VER}/www/api/drawing_wand.html
|
||||
share/ImageMagick-${VER}/www/api/drawing-wand.html
|
||||
share/ImageMagick-${VER}/www/api/effect.html
|
||||
share/ImageMagick-${VER}/www/api/enhance.html
|
||||
share/ImageMagick-${VER}/www/api/error.html
|
||||
share/ImageMagick-${VER}/www/api/exception.html
|
||||
share/ImageMagick-${VER}/www/api/fx.html
|
||||
share/ImageMagick-${VER}/www/api/image.html
|
||||
share/ImageMagick-${VER}/www/api/list.html
|
||||
share/ImageMagick-${VER}/www/api/magick-wand.html
|
||||
share/ImageMagick-${VER}/www/api/magick.html
|
||||
share/ImageMagick-${VER}/www/api/magick_wand.html
|
||||
share/ImageMagick-${VER}/www/api/memory.html
|
||||
share/ImageMagick-${VER}/www/api/monitor.html
|
||||
share/ImageMagick-${VER}/www/api/montage.html
|
||||
share/ImageMagick-${VER}/www/api/paint.html
|
||||
share/ImageMagick-${VER}/www/api/pixel_iterator.html
|
||||
share/ImageMagick-${VER}/www/api/pixel_wand.html
|
||||
share/ImageMagick-${VER}/www/api/pixel-iterator.html
|
||||
share/ImageMagick-${VER}/www/api/pixel-wand.html
|
||||
share/ImageMagick-${VER}/www/api/profile.html
|
||||
share/ImageMagick-${VER}/www/api/quantize.html
|
||||
share/ImageMagick-${VER}/www/api/registry.html
|
||||
@ -309,6 +269,7 @@ share/ImageMagick-${VER}/www/api/signature.html
|
||||
share/ImageMagick-${VER}/www/api/stream.html
|
||||
share/ImageMagick-${VER}/www/api/transform.html
|
||||
share/ImageMagick-${VER}/www/api/types.html
|
||||
share/ImageMagick-${VER}/www/api/version.html
|
||||
share/ImageMagick-${VER}/www/api/widget.html
|
||||
share/ImageMagick-${VER}/www/apis.html
|
||||
share/ImageMagick-${VER}/www/cd.html
|
||||
|
||||
Loading…
Reference in New Issue
Block a user