Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv22238
Modified Files:
imagemagick.info
Added Files:
imagemagick-nox.info
Log Message:
new upstream version; restructured imagemagick-nox package; added functionality
to both packages as suggested by jfm
Index: imagemagick.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/imagemagick.info,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- imagemagick.info 30 Nov 2007 02:30:53 -0000 1.19
+++ imagemagick.info 18 Feb 2008 00:07:28 -0000 1.20
@@ -1,27 +1,78 @@
Info2: <<
-Package: imagemagick%type_pkg[-nox]
-Type: -nox (boolean)
-Version: 6.3.5
-Revision: 1003
+#Package: imagemagick%type_pkg[-nox]
+Package: imagemagick
+Type: -nox (.)
+Version: 6.3.8
+Revision: 1001
GCC: 4.0
-Source: mirror:sourceforge:imagemagick/ImageMagick-%v-6.tar.gz
-Source-MD5: 54c2c91eafb416ae3419a78bb8d0162c
+Source: mirror:sourceforge:imagemagick/ImageMagick-%v-5.tar.gz
+Source-MD5: aeec2f77528dc53b21ff131c05d8c728
SourceDirectory: ImageMagick-%v
-Depends: %N10-shlibs (= %v-%r), (%type_raw[-nox] = .) x11-shlibs,
(%type_raw[-nox] = .) x11
-BuildDepends: pango1-xft2-dev, pkgconfig, (%type_raw[-nox] = .) x11-dev,
bzip2-dev, libjpeg, lcms, libpng3 (>= 1:1.2.18-1), libtiff, libxml2,
libiconv-dev, librsvg2 (>= 2.9.5-11), libdjvulibre15-dev
+Depends: <<
+ (%type_raw[-nox] = .) %N10-shlibs (= %v-%r),
+ lcms-shlibs (>= 1.11-1), libtiff-shlibs (>= 3.6.1-3), libjasper.1-shlibs (>=
1.900.1-1), libpng3-shlibs (>= 1:1.2.18-1), libdjvulibre15-shlibs (>=
3.5.18-1), libjpeg-shlibs (>= 6b-5), fontconfig2-shlibs (>= 2.2.3-10),
expat1-shlibs (>= 2.0.0-1), bzip2-shlibs (>= 1.0.2-2), libxml2-shlibs (>=
2.6.1-1), libiconv (>= 1.11-1), freetype219-shlibs (>= 2.1.9-1),
+ ghostscript | ghostscript%type_pkg[-nox], openexr,
+ (%type_raw[-nox] = .) gconf2-shlibs (>= 2.10.0-1),
+ (%type_raw[-nox] = .) glib2-shlibs (>= 2.12.0-1),
+ (%type_raw[-nox] = .) gnome-vfs2-unified-shlibs (>= 1:2.15.2-1),
+ (%type_raw[-nox] = .) gtk+2-shlibs (>= 2.6.7-1),
+ (%type_raw[-nox] = .) libart2-shlibs (>= 2.3.16-3),
+ (%type_raw[-nox] = .) libbonobo2-shlibs (>= 2.6.0-1),
+ (%type_raw[-nox] = .) libcroco3-shlibs (>= 0.6.0-11),
+ (%type_raw[-nox] = .) libgettext3-shlibs (>= 0.14-1),
+ (%type_raw[-nox] = .) libgsf-shlibs (>= 1.10.1-3),
+ (%type_raw[-nox] = .) libhowl-shlibs (>= 1.0.0-11),
+ (%type_raw[-nox] = .) librsvg2-shlibs (>= 2.9.5-11),
+ (%type_raw[-nox] = .) libwmf-shlibs (>= 0.2.8.2-1),
+ (%type_raw[-nox] = .) orbit2-shlibs (>= 2.14.0-1),
+ (%type_raw[-nox] = .) pango1-xft2-shlibs (>= 1.10.1-1),
+ (%type_raw[-nox] = .) x11-shlibs
+<<
+BuildDepends: <<
+ lcms, libtiff, libjasper.1, libpng3, libdjvulibre15-dev, libjpeg,
fontconfig2-dev, expat1, bzip2-dev, libxml2, libiconv-dev, freetype219,
+ openexr-dev,
+ (%type_raw[-nox] = .) gconf2-dev,
+ (%type_raw[-nox] = .) glib2-dev,
+ (%type_raw[-nox] = .) gnome-vfs2-unified-dev,
+ (%type_raw[-nox] = .) gtk+2-dev,
+ (%type_raw[-nox] = .) libart2,
+ (%type_raw[-nox] = .) libbonobo2-dev,
+ (%type_raw[-nox] = .) libcroco3,
+ (%type_raw[-nox] = .) libgettext3-dev,
+ (%type_raw[-nox] = .) libgsf-dev,
+ (%type_raw[-nox] = .) libhowl-dev,
+ (%type_raw[-nox] = .) librsvg2 (>= 2.9.5-11),
+ (%type_raw[-nox] = .) libwmf,
+ (%type_raw[-nox] = .) orbit2-dev,
+ (%type_raw[-nox] = .) pango1-xft2-dev,
+ (%type_raw[-nox] = .) popt,
+ (%type_raw[-nox] = .) x11-dev
+<<
Conflicts: imagemagick, imagemagick-nox
-Replaces: imagemagick, imagemagick-nox
-Provides: (%type_raw[-nox] = -nox) imagemagick
-ConfigureParams: --without-perl --mandir='${prefix}/share/man' --with-bzlib
--without-dps --without-fpx --without-fontconfig
--with-gs-font-dir=%p/share/ghostscript/fonts --without-gslib --without-gvc
--without-jbig --with-jpeg --without-jp2 --with-lcms --with-magic-plus-plus
--without-openexr --with-png --with-rsvg --with-tiff --without-wmf --with-xml
--with-zlib --with-djvu
+Replaces: imagemagick, imagemagick-nox, imagemagick10-shlibs (<< 6.3.8-1001),
imagemagick-nox10-shlibs (<< 6.3.8-1001)
+Provides: (%type_raw[-nox] = .) imagemagick-nox
+
+PatchScript: perl -pi -e 's,[EMAIL PROTECTED]@,$& -lstdc++,' Makefile.in
+ConfigureParams: <<
+ --without-perl --mandir='${prefix}/share/man' --enable-libtool-verbose
--with-bzlib --without-dps --without-fpx \
+ --with-gs-font-dir=%p/share/ghostscript/fonts --without-gslib --without-gvc
--with-jpeg --with-lcms \
+ --with-magic-plus-plus --with-png --with-tiff --with-xml --with-zlib
--with-djvu --with-fontconfig --enable-hdri
+<<
+NoSetLDFLAGS: true
+SetLDFLAGS: -L%p/lib/fontconfig2/lib -L%p/lib/freetype219/lib -L%p/lib
+NoSetCPPFLAGS: true
+SetCPPFLAGS: -I%p/lib/fontconfig2/include -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2 -I%p/include
CompileScript: <<
#!/bin/sh -ev
+ export PATH=%p/lib/freetype219/bin:$PATH
+ export
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
if [ "%type_raw[-nox]" == "." ]; then
- PKG_CONFIG=%p/bin/pkg-config ac_cv_func_poll=no ./configure %c --with-x
- fi
- if [ "%type_raw[-nox]" == "-nox" ]; then
- PKG_CONFIG=%p/bin/pkg-config ac_cv_func_poll=no ./configure %c --without-x
+ c="--with-x --with-rsvg"
+ else
+ c="--without-x --without-rsvg --without-wmf --disable-shared"
fi
- make
+ PKG_CONFIG=%p/bin/pkg-config ac_cv_func_poll=no ./configure %c $c
+ make CCLD=g++
<<
Description: Image manipulation tools
InstallScript: <<
@@ -31,6 +82,7 @@
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
+ perl -pi -e 's,-L%p/lib ,,g; s, -L%p/lib/freetype219/lib,,' %i/bin/*-config
/bin/rm -f %i/lib/libltdl*
<<
DescDetail: <<
@@ -42,30 +94,45 @@
color reduce, or add special effects to an image and save your
completed work in the same or a different image format.
<<
+DescPackaging: <<
+ In version 6.3.8-1001 and later, the imagemagick-nox package no longer
+ builds shared libraries and no longer has a -shlibs splitoff. There is
+ still a -dev splitoff, in case another package wishes to link to the
+ static library. Moreover, imagemagick now provides imagemagick-nox, rather
+ than vice versa.
+
+ Also in version 6.3.8-1001 and later, we have moved the plugins directory
+ %p/lib/ImageMagick-%v from the -shlibs splitoff to the main package,
+ and for this reason, the main package must Replace older versions of the
+ splitoff packages.
+<<
DescPort: <<
--without-perl is the correct option for building perlmagick as a
separate package (which we do).
configure has trouble finding pkg-config, so we tell it where to look.
- 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.
-
- In version >= 6.3.2, we disable fontconfig support because imagemagick wants
- version >= 2.4.1 but Apple's X11 only supplies version 2.1.0, and fink's
- fontconfig2 package only supplies version 2.3.2 (2.2.3 in stable).
-
Fink's graphviz package is very out of date, and doesn't contain the
libgvc library which imagemagick wants. (Disabled for now.)
+ 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.
+
+ We take fontconfig (and hence freetype) support from fink:
+ 1) in order to avoid x11 in the -nox version,
+ 2) for the x11-version, because imagemagick wants
+ version >= 2.4.1 but Apple's X11 only supplies version 2.1.0,
+ If it was just for xorg, it would have been more economical
+ as a matter of footprint to use xorg's fontconfig and freetype.
<<
SplitOff: <<
Package: %N10-shlibs
- Depends: ghostscript%type_pkg[-nox], (%type_raw[-nox] = .) x11,
(%type_raw[-nox] = .) x11-shlibs, bzip2-shlibs, libjpeg-shlibs, lcms-shlibs,
libpng3-shlibs, libtiff-shlibs, libxml2-shlibs, libiconv, libdjvulibre15-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
+ Depends: <<
+ lcms-shlibs (>= 1.11-1), libtiff-shlibs (>= 3.6.1-3), libjpeg-shlibs (>=
6b-5), fontconfig2-shlibs (>= 2.2.3-10), expat1-shlibs (>= 2.0.0-1),
bzip2-shlibs (>= 1.0.2-2), freetype219-shlibs (>= 2.1.9-1), x11-shlibs
+ <<
+ Conflicts: imagemagick-nox10-shlibs
+ Replaces: imagemagick-nox10-shlibs
+ Files: lib/lib*.*.dylib
Shlibs: <<
%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)
@@ -75,10 +142,9 @@
<<
SplitOff2: <<
Package: %N10-dev
- Depends: %N10-shlibs (= %v-%r), (%type_raw[-nox] = .) x11-shlibs,
(%type_raw[-nox] = .) x11
+ Depends: (%type_raw[-nox] = .) %N10-shlibs (= %v-%r)
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) imagemagick10-dev
Files: include lib/lib*.* lib/pkgconfig %p/bin/*-config
BuildDependsOnly: True
DocFiles: LICENSE README.txt ChangeLog NEWS
--- NEW FILE: imagemagick-nox.info ---
Info2: <<
#Package: imagemagick%type_pkg[-nox]
Package: imagemagick-nox
Type: -nox (-nox)
Version: 6.3.8
Revision: 1001
GCC: 4.0
Source: mirror:sourceforge:imagemagick/ImageMagick-%v-5.tar.gz
Source-MD5: aeec2f77528dc53b21ff131c05d8c728
SourceDirectory: ImageMagick-%v
Depends: <<
(%type_raw[-nox] = .) %N10-shlibs (= %v-%r),
lcms-shlibs (>= 1.11-1), libtiff-shlibs (>= 3.6.1-3), libjasper.1-shlibs (>=
1.900.1-1), libpng3-shlibs (>= 1:1.2.18-1), libdjvulibre15-shlibs (>=
3.5.18-1), libjpeg-shlibs (>= 6b-5), fontconfig2-shlibs (>= 2.2.3-10),
expat1-shlibs (>= 2.0.0-1), bzip2-shlibs (>= 1.0.2-2), libxml2-shlibs (>=
2.6.1-1), libiconv (>= 1.11-1), freetype219-shlibs (>= 2.1.9-1),
ghostscript | ghostscript%type_pkg[-nox], openexr,
(%type_raw[-nox] = .) gconf2-shlibs (>= 2.10.0-1),
(%type_raw[-nox] = .) glib2-shlibs (>= 2.12.0-1),
(%type_raw[-nox] = .) gnome-vfs2-unified-shlibs (>= 1:2.15.2-1),
(%type_raw[-nox] = .) gtk+2-shlibs (>= 2.6.7-1),
(%type_raw[-nox] = .) libart2-shlibs (>= 2.3.16-3),
(%type_raw[-nox] = .) libbonobo2-shlibs (>= 2.6.0-1),
(%type_raw[-nox] = .) libcroco3-shlibs (>= 0.6.0-11),
(%type_raw[-nox] = .) libgettext3-shlibs (>= 0.14-1),
(%type_raw[-nox] = .) libgsf-shlibs (>= 1.10.1-3),
(%type_raw[-nox] = .) libhowl-shlibs (>= 1.0.0-11),
(%type_raw[-nox] = .) librsvg2-shlibs (>= 2.9.5-11),
(%type_raw[-nox] = .) libwmf-shlibs (>= 0.2.8.2-1),
(%type_raw[-nox] = .) orbit2-shlibs (>= 2.14.0-1),
(%type_raw[-nox] = .) pango1-xft2-shlibs (>= 1.10.1-1),
(%type_raw[-nox] = .) x11-shlibs
<<
BuildDepends: <<
lcms, libtiff, libjasper.1, libpng3, libdjvulibre15-dev, libjpeg,
fontconfig2-dev, expat1, bzip2-dev, libxml2, libiconv-dev, freetype219,
openexr-dev,
(%type_raw[-nox] = .) gconf2-dev,
(%type_raw[-nox] = .) glib2-dev,
(%type_raw[-nox] = .) gnome-vfs2-unified-dev,
(%type_raw[-nox] = .) gtk+2-dev,
(%type_raw[-nox] = .) libart2,
(%type_raw[-nox] = .) libbonobo2-dev,
(%type_raw[-nox] = .) libcroco3,
(%type_raw[-nox] = .) libgettext3-dev,
(%type_raw[-nox] = .) libgsf-dev,
(%type_raw[-nox] = .) libhowl-dev,
(%type_raw[-nox] = .) librsvg2 (>= 2.9.5-11),
(%type_raw[-nox] = .) libwmf,
(%type_raw[-nox] = .) orbit2-dev,
(%type_raw[-nox] = .) pango1-xft2-dev,
(%type_raw[-nox] = .) popt,
(%type_raw[-nox] = .) x11-dev
<<
Conflicts: imagemagick, imagemagick-nox
Replaces: imagemagick, imagemagick-nox, imagemagick10-shlibs (<< 6.3.8-1001),
imagemagick-nox10-shlibs (<< 6.3.8-1001)
Provides: (%type_raw[-nox] = .) imagemagick-nox
PatchScript: perl -pi -e 's,[EMAIL PROTECTED]@,$& -lstdc++,' Makefile.in
ConfigureParams: <<
--without-perl --mandir='${prefix}/share/man' --enable-libtool-verbose
--with-bzlib --without-dps --without-fpx \
--with-gs-font-dir=%p/share/ghostscript/fonts --without-gslib --without-gvc
--with-jpeg --with-lcms \
--with-magic-plus-plus --with-png --with-tiff --with-xml --with-zlib
--with-djvu --with-fontconfig --enable-hdri
<<
NoSetLDFLAGS: true
SetLDFLAGS: -L%p/lib/fontconfig2/lib -L%p/lib/freetype219/lib -L%p/lib
NoSetCPPFLAGS: true
SetCPPFLAGS: -I%p/lib/fontconfig2/include -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2 -I%p/include
CompileScript: <<
#!/bin/sh -ev
export PATH=%p/lib/freetype219/bin:$PATH
export
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
if [ "%type_raw[-nox]" == "." ]; then
c="--with-x --with-rsvg"
else
c="--without-x --without-rsvg --without-wmf --disable-shared"
fi
PKG_CONFIG=%p/bin/pkg-config ac_cv_func_poll=no ./configure %c $c
make CCLD=g++
<<
Description: Image manipulation tools
InstallScript: <<
#!/bin/sh -ev
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
perl -pi -e 's,-L%p/lib ,,g; s, -L%p/lib/freetype219/lib,,' %i/bin/*-config
/bin/rm -f %i/lib/libltdl*
<<
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.
<<
DescPackaging: <<
In version 6.3.8-1001 and later, the imagemagick-nox package no longer
builds shared libraries and no longer has a -shlibs splitoff. There is
still a -dev splitoff, in case another package wishes to link to the
static library. Moreover, imagemagick now provides imagemagick-nox, rather
than vice versa.
Also in version 6.3.8-1001 and later, we have moved the plugins directory
%p/lib/ImageMagick-%v from the -shlibs splitoff to the main package,
and for this reason, the main package must Replace older versions of the
splitoff packages.
<<
DescPort: <<
--without-perl is the correct option for building perlmagick as a
separate package (which we do).
configure has trouble finding pkg-config, so we tell it where to look.
Fink's graphviz package is very out of date, and doesn't contain the
libgvc library which imagemagick wants. (Disabled for now.)
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.
We take fontconfig (and hence freetype) support from fink:
1) in order to avoid x11 in the -nox version,
2) for the x11-version, because imagemagick wants
version >= 2.4.1 but Apple's X11 only supplies version 2.1.0,
If it was just for xorg, it would have been more economical
as a matter of footprint to use xorg's fontconfig and freetype.
<<
#SplitOff: <<
# Package: %N10-shlibs
# Depends: <<
# lcms-shlibs (>= 1.11-1), libtiff-shlibs (>= 3.6.1-3), libjpeg-shlibs (>=
6b-5), fontconfig2-shlibs (>= 2.2.3-10), expat1-shlibs (>= 2.0.0-1),
bzip2-shlibs (>= 1.0.2-2), freetype219-shlibs (>= 2.1.9-1), x11-shlibs
# <<
# Conflicts: imagemagick-nox10-shlibs
# Replaces: imagemagick-nox10-shlibs
# Files: lib/lib*.*.dylib
# Shlibs: <<
# %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: LICENSE README.txt ChangeLog NEWS
#<<
SplitOff2: <<
Package: %N10-dev
Depends: (%type_raw[-nox] = .) %N10-shlibs (= %v-%r)
Conflicts: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev
Replaces: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev
Files: include lib/lib*.* lib/pkgconfig %p/bin/*-config
BuildDependsOnly: True
DocFiles: LICENSE README.txt ChangeLog NEWS
<<
DocFiles: LICENSE README.txt ChangeLog NEWS
License: BSD
Maintainer: Dave Morrison <[EMAIL PROTECTED]>
Homepage: http://www.imagemagick.org/
#end of Info2
<<
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
