Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv26629

Modified Files:
        synfig.info synfigstudio.info 
Removed Files:
        synfigstudio.patch 
Log Message:
flags & deps for pangocairo ("Works For Me"); layout & shlibs policy fixes


--- synfigstudio.patch DELETED ---

Index: synfigstudio.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/synfigstudio.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- synfigstudio.info   12 Mar 2008 05:09:54 -0000      1.4
+++ synfigstudio.info   23 Jul 2008 11:09:21 -0000      1.5
@@ -1,49 +1,116 @@
 Package: synfigstudio
 Version: 0.61.08
 
-Revision: 1000
+Revision: 1001
 
 # Source: http://www.i8u.org/~htodd/finksrc/%n-%v.tar.bz2
 # SourceDirectory: synfigstudio
 Source: mirror:sourceforge:synfig/synfigstudio-%v.tar.gz
 Source-MD5: e75cd46d2449ad057f3e2a31b451c7b7
 
-PatchFile: %n.patch
-PatchFile-md5: 7e0a029e1b350d4317b3eb0389878a21
+#PatchFile: %n.patch
+#PatchFile-md5: 7e0a029e1b350d4317b3eb0389878a21
 
-PatchScript: <<
-sed 's|@PREFIX@|%p|g' %{PatchFile} | patch -p1
-<<
+#PatchScript: <<
+#sed 's|@PREFIX@|%p|g' %{PatchFile} | patch -p1
+#<<
 
 
 Maintainer: Hisashi T Fujinaka <[EMAIL PROTECTED]>
 
-Depends: synfig (>= 0.61.08), synfig-shlibs (>= 0.61.08), synfigstudio-shlibs 
(>= 0.61.08), gtkmm2.4-shlibs, gtk+2-shlibs, glibmm2.4-shlibs, libsigc++2-shlibs
-BuildDepends: synfig-dev (>= 0.61.08), gtkmm2.4-dev, gtk+2-dev, glibmm2.4-dev, 
libsigc++2, fink (>= 0.28)
+Depends: <<
+       %N-shlibs (= %v-%r),
+       atk1-shlibs (>= 1.20.0-1),
+       cairo-shlibs (>= 1.6-1),
+       cairomm1-shlibs,
+       expat1-shlibs,
+       fontconfig2-shlibs (>= 2.4.1-1),
+       freetype219-shlibs (>= 2.3.5-1),
+       glib2-shlibs (>= 2.14.0-1),
+       glibmm2.4-shlibs (>= 2.14.0-1),
+       glitz-shlibs,
+       gtk+2-shlibs (>= 2.12.0-1),
+       gtkmm2.4-shlibs (>= 2.12.0-1),
+       libgettext3-shlibs,
+       libiconv,
+       libpng3-shlibs,
+       libsigc++2-shlibs,
+       libxml++2-shlibs (>= 2.20.0-1),
+       libxml2-shlibs (>= 2.6.30-1),
+       pango1-xft2-ft219-shlibs (>= 1.18.4-4),
+       pixman-shlibs (>= 0.10.0-1),
+       synfig-shlibs (>= 0.61.08-1001),
+       x11
+<<
+BuildDepends: <<
+       atk1 (>= 1.20.0-1),
+       cairo (>= 1.6-1),
+       cairomm1,
+       etl (>= 0.4.11),
+       expat1,
+       fink (>= 0.28),
+       fontconfig2-dev (>= 2.4.1-1),
+       freetype219 (>= 2.3.5-1),
+       gettext-tools,
+       glib2-dev (>= 2.14.0-1),
+       glibmm2.4-dev (>= 2.14.0-1),
+       glitz,
+       gtk+2-dev (>= 2.12.0-1),
+       gtkmm2.4-dev (>= 2.12.0-1),
+       libgettext3-dev,
+       libiconv-dev,
+       libpng3,
+       libsigc++2,
+       libxml++2 (>= 2.20.0-1),
+       libxml2 (>= 2.6.30-1),
+       openexr-dev,
+       pango1-xft2-ft219-dev (>= 1.18.4-4),
+       pixman (>= 0.10.0-1),
+       pkgconfig,
+       synfig (>= 0.61.08-1001),
+       synfig-dev (>= 0.61.08-1001),
+       x11-dev,
+       xft2-dev
+<<
 
 Description: Animation studio for 2D animation renderer
 Homepage: http://synfig.org/
 License: GPL
 
-# ConfigureParams: --includedir=%i/include
+SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0 
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2 
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include
+SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib 
-L%p/lib/fontconfig2/lib
+ConfigureParams: 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 
-CompileScript: <<
-       #!/bin/sh -ev
-       autoreconf -if
-       ./configure %c
-       make
-<<
+#CompileScript: <<
+#      #!/bin/sh -ev
+#      autoreconf -if
+#      ./configure %c
+#      make
+#<<
 
 SplitOff: <<
        Package: %N-shlibs
-       Files: lib/libsynfigapp.0.0.0.dylib lib/libsynfigapp.0.dylib 
lib/libsynfigapp.dylib
+       Depends: <<
+               glib2-shlibs (>= 2.14.0-1),
+               glibmm2.4-shlibs (>= 2.14.0-1),
+               libgettext3-shlibs,
+               libiconv,
+               libsigc++2-shlibs,
+               libxml++2-shlibs (>= 2.20.0-1),
+               libxml2-shlibs (>= 2.6.30-1),
+               synfig-shlibs (>= 0.61.08-1001)
+       <<
+       Files: lib/libsynfigapp.0.0.0.dylib lib/libsynfigapp.0.dylib
+       # move share/locale from %N? (rename with libmajorversion?)
        DocFiles: AUTHORS COPYING INSTALL NEWS README
-       Shlibs: !%p/lib/libsynfigapp.0.dylib
+       Shlibs: %p/lib/libsynfigapp.0.dylib 1.0.0 %n (>= 0.61.08-1001)
 <<
 
 SplitOff2: <<
        Package: %N-dev
-       Files: include/synfigapp-0.0/synfigapp
+       Depends: %N-shlibs (= %v-%r)
+       Replaces: %N (<< 0.61.08-1001), %N-shlibs (<< 0.61.08-1001)
+       Files: include lib
        DocFiles: AUTHORS COPYING INSTALL NEWS README
 <<
 
@@ -53,3 +120,7 @@
        Synfigstudio is the animation studio for synfig and provides the GUI 
interface
        to create synfig animations which are saved in synfig .sif format.
 <<
+DescPackaging: <<
+       Major shuffling of package layout for pangocairo and shlibs
+       policy as of 0.61.08-1001
+<<

Index: synfig.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/synfig.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- synfig.info 12 Mar 2008 05:09:54 -0000      1.9
+++ synfig.info 23 Jul 2008 11:09:20 -0000      1.10
@@ -1,7 +1,7 @@
 Package: synfig
 Version: 0.61.08
 
-Revision: 1000
+Revision: 1001
 
 # Source: http://www.i8u.org/~htodd/finksrc/%n-%v.tar.bz2
 Source: mirror:sourceforge:synfig/synfig-%v.tar.gz
@@ -11,15 +11,54 @@
 
 Maintainer: Hisashi T Fujinaka <[EMAIL PROTECTED]>
 
-Depends: libxml++2-shlibs, libsigc++2-shlibs, imagemagick10-shlibs, 
libdv4-shlibs, libavcodec1-shlibs, freetype219-shlibs, fontconfig2-shlibs, 
libgettext3-shlibs, synfig-shlibs (>= 0.61.08)
-BuildDepends: fink (>= 0.28), etl (>= 0.4.11), libxml++2, libsigc++2, 
imagemagick, imagemagick10-dev, libdv4, libavcodec1-dev, freetype219, 
fontconfig2-dev, openexr-dev, pkgconfig, libgettext3-dev
+Depends: <<
+       %N-shlibs (= %v-%r),
+       glib2-shlibs (>= 2.14.0-1),
+       glibmm2.4-shlibs (>= 2.14.0-1),
+       libgettext3-shlibs,
+       libiconv,
+       libsigc++2-shlibs,
+       libxml++2-shlibs (>= 2.20.0-1),
+       libxml2-shlibs (>= 2.6.30-1)
+<<
+BuildDepends: <<
+       bzip2-dev,
+       etl (>= 0.4.11),
+       expat1,
+       fontconfig2-dev (>= 2.4.1-1),
+       freetype219 (>= 2.3.5-1),
+       gettext-tools,
+       glib2-dev (>= 2.14.0-1),
+       glibmm2.4-dev (>= 2.14.0-1),
+       imagemagick1-dev (>= 6.4.1-1011),
+       lcms,
+       libgettext3-dev,
+       libiconv-dev,
+       libjpeg,
+       libmng2,
+       libpng3,
+       libsigc++2,
+       libtiff-shlibs,
+       libxml++2 (>= 2.20.0-1),
+       libxml2 (>= 2.6.30-1),
+       openexr-dev,
+       pkgconfig
+<<
+
 GCC: 4.0
 
 Description: Vector-based 2D animation renderer
 Homepage: http://synfig.sourceforge.net/
 License: GPL
 
-# ConfigureParams: --includedir=%i/include
+PatchScript: <<
+       perl -pi -e 's/-lMagick(?!\+\+)/-lMagickCore/' configure
+       perl -ni -e 'print unless /mod_libavcodec/' 
src/modules/synfig_modules.cfg.in
+<<
+
+SetCPPFLAGS: -I%p/include/ImageMagick -I%p/lib/pango-ft219/include/pango-1.0 
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2 
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include
+SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib 
-L%p/lib/fontconfig2/lib
+ConfigureParams: --without-libavcodec 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
 
 # CompileScript: <<
 #      #!/bin/sh -ev
@@ -41,14 +80,41 @@
 
 SplitOff: <<
        Package: %N-shlibs
-       Files: lib/libsynfig.0.0.0.dylib lib/libsynfig.0.dylib 
lib/libsynfig.dylib lib/synfig/*
+       Depends: <<
+               bzip2-shlibs,
+               expat1-shlibs,
+               fontconfig2-shlibs (>= 2.4.1-1),
+               freetype219-shlibs (>= 2.3.5-1),
+               glib2-shlibs (>= 2.14.0-1),
+               glibmm2.4-shlibs (>= 2.14.0-1),
+               imagemagick,
+               imagemagick1-shlibs (>= 6.4.1-1011),
+               lcms-shlibs,
+               libgettext3-shlibs,
+               libiconv,
+               libjpeg-shlibs,
+               libmng2-shlibs,
+               libpng3-shlibs,
+               libsigc++2-shlibs,
+               libtiff-shlibs,
+               libxml++2-shlibs (>= 2.20.0-1),
+               libxml2-shlibs (>= 2.6.30-1)
+       <<
+       Files: lib/libsynfig.0.0.0.dylib lib/libsynfig.0.dylib lib/synfig
+       # move share/locale from %N? (rename with libmajorversion?)
        DocFiles: AUTHORS COPYING INSTALL NEWS README
-       Shlibs: !%p/lib/libsynfig.0.dylib
+       Shlibs: %p/lib/libsynfig.0.dylib 1.0.0 %n (>= 0.61.08-1001)
 <<
 
 SplitOff2: <<
        Package: %N-dev
-       Files: include/synfig-0.0/synfig
+       Depends: %N-shlibs (= %v-%r)
+       Replaces: %N (<< 0.61.08-1001), %N-shlibs (<< 0.61.08-1001)
+       Files: <<
+               bin/synfig-config
+               include
+               lib
+       <<
        DocFiles: AUTHORS COPYING INSTALL NEWS README
 <<
 
@@ -61,3 +127,24 @@
 This package contains the command-line renderer, the GUI animation editor is in
 synfigstudio.
 <<
+DescPackaging: <<
+       Disable libavcodec because it's a newer version in fink
+       incompatible with synfig. See:
+       http://synfig.org/forums/viewtopic.php?f=13&t=5
+       Older libavcoded has no .pc so synfig doesn't even find it.
+
+       Remove libavcodec from config file (list of active mods)
+       because it won't exist (silences runtime warnings). Why isn't
+       this list auto-generated during pkg build process?
+
+       Doesn't use Magick's native flag detector:
+
+               Need to pass -I globally so that configure finds it.
+
+               Main lib is now MagickCore not Magick.
+
+       Links magick libs and also uses magick's "convert" program.
+
+       Major shuffling of package layout for pangocairo and shlibs
+       policy as of 0.61.08-1001
+<<


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to