Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv22810
Modified Files:
Tag: pangocairo-branch
imagemagick.info
Log Message:
dep and other fixes
Index: imagemagick.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/imagemagick.info,v
retrieving revision 1.10.2.6
retrieving revision 1.10.2.7
diff -u -d -r1.10.2.6 -r1.10.2.7
--- imagemagick.info 28 Sep 2007 20:25:41 -0000 1.10.2.6
+++ imagemagick.info 9 Nov 2007 22:40:19 -0000 1.10.2.7
@@ -1,39 +1,59 @@
Info2: <<
Package: imagemagick%type_pkg[-nox]
Type: -nox (boolean)
+# Is for the moment rather a "no-rsvg" variant. This gets rid of the bulk of
additional deps.
+# If there is real interest in a "nox" variant, one should also disable libwmf.
+# (just using --without-x would not change the deps)
Version: 6.3.5
-Revision: 1003
+Revision: 1104
GCC: 4.0
Source: mirror:sourceforge:imagemagick/ImageMagick-%v-6.tar.gz
Source-MD5: 54c2c91eafb416ae3419a78bb8d0162c
SourceDirectory: ImageMagick-%v
-Depends: %N10-shlibs (= %v-%r), (%type_raw[-nox] = .) x11-shlibs,
(%type_raw[-nox] = .) x11
-BuildDepends: pango1-xft2-ft219-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, freetype219
-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
+Depends: %N10-shlibs (= %v-%r)
+BuildDepends: <<
+ (%type_raw[-nox] = .) avahi-dev, bzip2-dev, (%type_raw[-nox] = .) cairo,
(%type_raw[-nox] = .) dbus-dev,
+ expat1, fontconfig2-dev, freetype219, (%type_raw[-nox] = .) gconf2-dev,
(%type_raw[-nox] = .) glib2-dev,
+ (%type_raw[-nox] = .) glitz, (%type_raw[-nox] = .) gnome-vfs2-unified-dev,
(%type_raw[-nox] = .) gtk+2-dev,
+ (%type_raw[-nox] = .) libart2, (%type_raw[-nox] = .) libavahi-glib1-dev,
(%type_raw[-nox] = .) libbonobo2-dev,
+ lcms, (%type_raw[-nox] = .) libcroco3, libdjvulibre15-dev, (%type_raw[-nox] =
.) libgettext3-dev,
+ (%type_raw[-nox] = .) libgsf1.114-dev, libiconv-dev, libjasper.1, libjpeg,
libpng3 (>= 1:1.2.18-1),
+ (%type_raw[-nox] = .) librsvg2 (>= 2.9.5-11), libtiff, libwmf, libxml2,
(%type_raw[-nox] = .) orbit2-dev,
+ (%type_raw[-nox] = .) pango1-xft2-ft219-dev (>= 1.18.2-1), pkgconfig,
(%type_raw[-nox] = .) popt,
+ (%type_raw[-nox] = .) x11-dev
+<<
+Conflicts: %{Ni}, %{Ni}-nox
+Replaces: %{Ni}, %{Ni}-nox
+# The different provides should probably go when dependent pkgs are adjusted
not to rely on them..
+# They do cause occasional trouble..
+Provides: (%type_raw[-nox] = .) %{Ni}-nox
+SetCPPFLAGS: -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include
+SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib
+ConfigureParams: <<
+ --mandir='${prefix}/share/man' --with-gs-font-dir=%p/share/ghostscript/fonts
\
+ --enable-libtool-verbose --without-perl --without-openexr --with-x
--enable-hdri
+<<
+
CompileScript: <<
#!/bin/sh -ev
-
export PATH=%p/lib/freetype219/bin:$PATH
if [ "%type_raw[-nox]" == "." ]; then
- PKG_CONFIG=%p/bin/pkg-config ac_cv_func_poll=no ./configure %c --with-x
+ PKG_CONFIG=%p/bin/pkg-config ac_cv_func_poll=no ./configure %c --with-rsvg
fi
if [ "%type_raw[-nox]" == "-nox" ]; then
- PKG_CONFIG=%p/bin/pkg-config ac_cv_func_poll=no ./configure %c --without-x
+ PKG_CONFIG=%p/bin/pkg-config ac_cv_func_poll=no ./configure %c --without-rsvg
fi
- perl -pi -e 's,^LDFLAGS = ,LDFLAGS = -L%p/lib/freetype219/lib ,' Makefile
make
<<
Description: Image manipulation tools
InstallScript: <<
#!/bin/sh -ev
- make -j1 install DESTDIR=%d
+ 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: <<
@@ -64,10 +84,13 @@
<<
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, freetype219-shlibs
+ Depends: <<
+ bzip2-shlibs, lcms-shlibs, libdjvulibre15-shlibs, libjasper.1-shlibs,
+ (%type_raw[-nox] = .) librsvg2-shlibs, libwmf-shlibs, libxml2-shlibs
+ <<
Conflicts: imagemagick10-shlibs, imagemagick-nox10-shlibs
Replaces: imagemagick10-shlibs, imagemagick-nox10-shlibs
- Provides: (%type_raw[-nox] = -nox) imagemagick10-shlibs
+ Provides: (%type_raw[-nox] = .) imagemagick-nox10-shlibs
Files: lib/lib*.*.dylib %p/lib/ImageMagick-%v
Shlibs: <<
%p/lib/libMagick++.10.dylib 11.0.0 %n (>= 6.2.8-1)
@@ -78,10 +101,10 @@
<<
SplitOff2: <<
Package: %N10-dev
- Depends: %N10-shlibs (= %v-%r), (%type_raw[-nox] = .) x11-shlibs,
(%type_raw[-nox] = .) x11
+ Depends: %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
+# Provides: (%type_raw[-nox] = .) imagemagick-nox10-dev
Files: include lib/lib*.* lib/pkgconfig %p/bin/*-config
BuildDependsOnly: True
DocFiles: LICENSE README.txt ChangeLog NEWS
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
