Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv9109
Modified Files:
imagemagick.info
Added Files:
imagemagick-dev.info imagemagick-dev.patch
Removed Files:
imagemagick.patch
Log Message:
update to latest version, with permission of maintainer
--- NEW FILE: imagemagick-dev.patch ---
diff -ruN ImageMagick-6.1.8/coders/png.c ImageMagick-6.1.8-patched/coders/png.c
--- ImageMagick-6.1.8/coders/png.c 2005-01-13 20:07:47.000000000 -0500
+++ ImageMagick-6.1.8-patched/coders/png.c 2006-08-05 12:26:06.000000000
-0400
@@ -1701,7 +1701,7 @@
#if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) \
&& (PNG_LIBPNG_VER >= 10200)
/* Disable thread-unsafe features of pnggccrd */
- if (png_access_version() >= 10200)
+ if (png_access_version_number() >= 10200)
{
png_uint_32 mmx_disable_mask=0;
png_uint_32 asm_flags;
@@ -1710,8 +1710,8 @@
| PNG_ASM_FLAG_MMX_READ_FILTER_SUB \
| PNG_ASM_FLAG_MMX_READ_FILTER_AVG \
| PNG_ASM_FLAG_MMX_READ_FILTER_PAETH );
- asm_flags=png_get_asm_flags(png_ptr);
- png_set_asm_flags(png_ptr, asm_flags & ~mmx_disable_mask);
+ asm_flags=png_get_asm_flags(ping);
+ png_set_asm_flags(ping, asm_flags & ~mmx_disable_mask);
}
#endif
--- NEW FILE: imagemagick-dev.info ---
Info2: <<
Package: imagemagick%type_pkg[-nox]-dev
Type: -nox (boolean)
Version: 6.1.8
Revision: 1006
GCC: 4.0
Source: mirror:sourceforge:imagemagick/ImageMagick-%v-7.tar.gz
Source-MD5: a79d01f885b2727489c26238946be27a
SourceDirectory: ImageMagick-%v
SourceRename: ImageMagick-%v.tar.gz
Patch: %{ni}.patch
BuildDependsOnly: True
Depends: imagemagick%type_pkg[-nox]-shlibs (= %v-%r), (%type_raw[-nox] = .)
x11-shlibs, (%type_raw[-nox] = .) x11
BuildDepends: libjpeg, libpng3, libtiff, libxml2, lcms, bzip2-dev,
libiconv-dev, (%type_raw[-nox] = .) x11-dev, libtool14
Conflicts: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev
Replaces: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev
Provides: (%type_raw[-nox] = -nox) imagemagick-dev
ConfigureParams: --without-perl --mandir='${prefix}/share/man' --enable-lzw
--without-hdf5 --with-bzlib --without-dps --without-fpx --with-ttf
--without-gslib --with-gs-font-dir=%p/share/ghostscript/fonts --without-jbig
--with-jpeg --without-jp2 --with-lcms --without-mpeg2 --with-magic-plus-plus
--with-png --with-tiff -without-wmf --with-xml --with-zlib
CompileScript: <<
#!/bin/sh -e
if [ "%type_raw[-nox]" == "." ]; then
ac_cv_func_poll=no ./configure %c --with-x
fi
if [ "%type_raw[-nox]" == "-nox" ]; then
ac_cv_func_poll=no ./configure %c --without-x
fi
make
<<
Description: Image manipulation tools
InstallScript: <<
#!/bin/sh -e
make install DESTDIR=%d
if [ "%type_raw[-nox]" == "." ]; then
perl -pi -e "s|-lXext -lSM -lICE -lX11||g" %i/lib/libMagick*la
perl -pi -e "s|-L/usr/X11R6/lib||g" %i/lib/libMagick*la
fi
/bin/rm -f %i/lib/libltdl*
# remove the things which used to be in the imagemagick splitoff
/bin/rm -R %i/share/man
/bin/rm -R %i/share/ImageMagick-%v
/bin/rm -R %i/bin
<<
DescDetail: <<
ImageMagick is a robust collection of tools and libraries to read,
write, and manipulate an image in many image formats (over 68 major formats)
including popular formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF.
With ImageMagick you can create images dynamically, making it
suitable for Web applications. You can also resize, rotate, sharpen,
color reduce, or add special effects to an image and save your
completed work in the same or a different image format.
<<
DescPort: <<
In version 5.5.6-23, we get around the libpoll problem in OS X 10.3 by
fooling ./configure into thinking that poll is not present.
<<
SplitOff: <<
Package: imagemagick%type_pkg[-nox]-shlibs
Depends: libtool14-shlibs, libjpeg-shlibs, libpng3-shlibs, libtiff-shlibs,
bzip2, ghostscript%type_pkg[-nox], libxml2-shlibs, lcms-shlibs,
(%type_raw[-nox] = .) x11-shlibs, (%type_raw[-nox] = .) x11
Conflicts: imagemagick-shlibs, imagemagick-nox-shlibs
Replaces: imagemagick-shlibs, imagemagick-nox-shlibs
Provides: (%type_raw[-nox] = -nox) imagemagick-shlibs
Files: lib/lib*.*.dylib %p/lib/ImageMagick-%v
Shlibs: <<
%p/lib/libMagick++.6.dylib 8.0.0 %n (>= 6.1.8-7)
%p/lib/libWand.6.dylib 8.0.0 %n (>= 6.1.8-7)
%p/lib/libMagick.6.dylib 8.0.0 %n (>= 6.1.8-7)
<<
DocFiles: www/Copyright.html README.txt ChangeLog NEWS
<<
DocFiles: www/Copyright.html README.txt ChangeLog NEWS
License: BSD
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Homepage: http://www.imagemagick.org/
#end of Info2
<<
Index: imagemagick.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/imagemagick.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- imagemagick.info 9 Aug 2006 22:55:21 -0000 1.5
+++ imagemagick.info 15 Aug 2006 15:26:05 -0000 1.6
@@ -1,15 +1,14 @@
Info2: <<
Package: imagemagick%type_pkg[-nox]
Type: -nox (boolean)
-Version: 6.1.8
-Revision: 1005
+Version: 6.2.8
+Revision: 1001
GCC: 4.0
Source: mirror:sourceforge:imagemagick/ImageMagick-%v-7.tar.gz
-Source-MD5: a79d01f885b2727489c26238946be27a
+Source-MD5: e4ff32bd17333e78f895379f2e564035
SourceDirectory: ImageMagick-%v
SourceRename: ImageMagick-%v.tar.gz
-Patch: %{ni}.patch
-Depends: %N-shlibs (= %v-%r), (%type_raw[-nox] = .) x11-shlibs,
(%type_raw[-nox] = .) x11, libtool14-shlibs
+Depends: %N10-shlibs (= %v-%r), (%type_raw[-nox] = .) x11-shlibs,
(%type_raw[-nox] = .) x11, libtool14-shlibs
BuildDepends: libjpeg, libpng3, libtiff, libxml2, lcms, bzip2-dev,
libiconv-dev, (%type_raw[-nox] = .) x11-dev, libtool14
Conflicts: imagemagick, imagemagick-nox
Replaces: imagemagick, imagemagick-nox
@@ -49,30 +48,30 @@
fooling ./configure into thinking that poll is not present.
<<
SplitOff: <<
- Package: %N-shlibs
+ Package: %N10-shlibs
Depends: libtool14-shlibs, libjpeg-shlibs, libpng3-shlibs, libtiff-shlibs,
bzip2, ghostscript%type_pkg[-nox], libxml2-shlibs, lcms-shlibs,
(%type_raw[-nox] = .) x11-shlibs, (%type_raw[-nox] = .) x11
- Conflicts: imagemagick-shlibs, imagemagick-nox-shlibs
- Replaces: imagemagick-shlibs, imagemagick-nox-shlibs
- Provides: (%type_raw[-nox] = -nox) imagemagick-shlibs
+ Conflicts: imagemagick10-shlibs, imagemagick-nox10-shlibs
+ Replaces: imagemagick10-shlibs, imagemagick-nox10-shlibs
+ Provides: (%type_raw[-nox] = -nox) imagemagick10-shlibs
Files: lib/lib*.*.dylib %p/lib/ImageMagick-%v
Shlibs: <<
- %p/lib/libMagick++.6.dylib 8.0.0 %n (>= 6.1.8-7)
- %p/lib/libWand.6.dylib 8.0.0 %n (>= 6.1.8-7)
- %p/lib/libMagick.6.dylib 8.0.0 %n (>= 6.1.8-7)
+ %p/lib/libMagick++.10.dylib 11.0.0 %n (>= 6.2.8-1)
+ %p/lib/libWand.10.dylib 11.0.0 %n (>= 6.2.8-1)
+ %p/lib/libMagick.10.dylib 11.0.0 %n (>= 6.2.8-1)
<<
- DocFiles: www/Copyright.html README.txt ChangeLog NEWS
+ DocFiles: LICENSE README.txt ChangeLog NEWS
<<
SplitOff2: <<
- Package: %N-dev
- Depends: %N-shlibs (= %v-%r), (%type_raw[-nox] = .) x11-shlibs,
(%type_raw[-nox] = .) x11
- Conflicts: imagemagick-dev, imagemagick-nox-dev
- Replaces: imagemagick-dev, imagemagick-nox-dev
- Provides: (%type_raw[-nox] = -nox) imagemagick-dev
+ Package: %N10-dev
+ Depends: %N10-shlibs (= %v-%r), (%type_raw[-nox] = .) x11-shlibs,
(%type_raw[-nox] = .) x11
+ Conflicts: imagemagick10-dev, imagemagick-nox10-dev, imagemagick-dev,
imagemagcik-nox-dev
+ Replaces: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev
+ Provides: (%type_raw[-nox] = -nox) imagemagick10-dev
Files: include lib/lib*.* lib/pkgconfig %p/bin/*-config
BuildDependsOnly: True
- DocFiles: www/Copyright.html README.txt ChangeLog NEWS
+ DocFiles: LICENSE README.txt ChangeLog NEWS
<<
-DocFiles: www/Copyright.html README.txt ChangeLog NEWS
+DocFiles: LICENSE README.txt ChangeLog NEWS
License: BSD
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Homepage: http://www.imagemagick.org/
--- imagemagick.patch DELETED ---
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
