Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv12108/graphics
Modified Files:
etl.info etl.patch
Added Files:
synfig.info synfig.patch
Log Message:
Synfig to 10.7
--- NEW FILE: synfig.patch ---
(This appears to be a binary file; contents omitted.)
Index: etl.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/etl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- etl.patch 28 Jul 2011 00:34:30 -0000 1.1
+++ etl.patch 28 Jul 2011 18:19:21 -0000 1.2
@@ -1,6 +1,36 @@
diff -Naur ETL-0.04.14.orig/ETL/_bezier.h ETL-0.04.14/ETL/_bezier.h
--- ETL-0.04.14.orig/ETL/_bezier.h 2011-07-27 13:18:00.000000000 -0700
-+++ ETL-0.04.14/ETL/_bezier.h 2011-07-27 13:37:56.000000000 -0700
++++ ETL-0.04.14/ETL/_bezier.h 2011-07-27 21:29:16.000000000 -0700
+@@ -563,8 +563,8 @@
+ for(;i;i--)
+ {
+ // compare 33% of the way between r and s with
67% of the way between r and s
+- if(dist(operator()((s-r)*(1.0/3.0)+r), x) <
+- dist(operator()((s-r)*(2.0/3.0)+r), x))
++ if(dist(this->operator()((s-r)*(1.0/3.0)+r), x)
<
++ dist(this->operator()((s-r)*(2.0/3.0)+r), x))
+ s=t;
+ else
+ r=t;
+@@ -579,15 +579,15 @@
+ const time_type inc((s-r)/steps);
+ if (!inc) return 0;
+ distance_type ret(0);
+- value_type last(operator()(r));
++ value_type last(this->operator()(r));
+
+ for(r+=inc;r<s;r+=inc)
+ {
+- const value_type n(operator()(r));
++ const value_type n(this->operator()(r));
+ ret+=dist.uncook(dist(last,n));
+ last=n;
+ }
+- ret+=dist.uncook(dist(last,operator()(r)))*(s-(r-inc))/inc;
++
ret+=dist.uncook(dist(last,this->operator()(r)))*(s-(r-inc))/inc;
+
+ return ret;
+ }
@@ -623,16 +623,16 @@
rt[3] = d;
@@ -36,3 +66,14 @@
value_type pop_time()
{
+diff -Naur ETL-0.04.14.orig/ETL/_curve_func.h ETL-0.04.14/ETL/_curve_func.h
+--- ETL-0.04.14.orig/ETL/_curve_func.h 2011-07-27 13:18:00.000000000 -0700
++++ ETL-0.04.14/ETL/_curve_func.h 2011-07-27 21:41:40.000000000 -0700
+@@ -30,6 +30,7 @@
+ /* === H E A D E R S =======================================================
*/
+
+ #include <functional>
++#include <math.h>
+
+ /* -- C L A S S E S ---------------------------------------------------------
*/
+
Index: etl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/etl.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- etl.info 28 Jul 2011 00:34:29 -0000 1.3
+++ etl.info 28 Jul 2011 18:19:20 -0000 1.4
@@ -4,7 +4,7 @@
Source-MD5: 7cb91905cbe07af327340aeba2226c06
PatchFile: %n.patch
-PatchFile-MD5: 2c5ba32f23b67c9f5d131a0fbe767388
+PatchFile-MD5: c67d96b85affa295f3caddf92187e92c
Maintainer: Hisashi T Fujinaka <ht...@fls.portland.or.us>
--- NEW FILE: synfig.info ---
Package: synfig
Version: 0.63.00
Revision: 1
Source: mirror:sourceforge:synfig/synfig-%v.tar.gz
Source-MD5: 5555523dbe1401ff4d4be8094a54b939
PatchFile: %n.patch
PatchFile-MD5: f751412cd39366a400388a15fd16c6a4
Maintainer: Hisashi T Fujinaka <ht...@fls.portland.or.us>
Depends: <<
%N-shlibs (=%v-%r),
glib2-shlibs (>=2.22.0-1),
glibmm2.4-shlibs (>=2.22.0-1),
libgettext8-shlibs,
libsigc++2-shlibs (>=2.2.4.2-2),
libxml++2-shlibs (>=2.26.1-2),
libxml2-shlibs (>=2.6.32-1)
<<
BuildDepends: <<
fink (>= 0.24.12),
etl (>= 0.04.14-2),
fontconfig2-dev (>= 2.8.0-4),
freetype219 (>= 2.3.12-1),
glib2-dev (>=2.22.0-1),
glibmm2.4-dev (>=2.22.0-1),
graphicsmagick-dev,
libgettext8-dev,
libiconv-dev (>=1.12-3),
libjpeg8,
libmng2,
libpng3,
libsigc++2 (>=2.2.4.2-2),
libxml++2 (>=2.26.1-2),
libxml2 (>=2.6.32-1),
openexr-dev,
pkgconfig (>= 0.23-2)
<<
# GCC: 4.0
Description: Vector-based 2D animation renderer
Homepage: http://synfig.sourceforge.net/
License: GPL
PatchScript: <<
%{default_script}
perl -pi -e 's/-lMagick/-lGraphicsMagick/' configure
perl -ni -e 'print unless /mod_libavcodec/'
src/modules/synfig_modules.cfg.in
#
# # These two fix for the split of libMagick in recent releases - AdamW
sed -i -e
's.Magick,OptimizeImageTransparency.MagickCore,OptimizeImageTransparency.g'
configure
# sed -i -e 's,MagickLib::,MagickCore::,g'
src/modules/mod_magickpp/trgt_magickpp.cpp
#
# perl -pi -e 's,(-lMagick\+\+),\1 -L/usr/X11R6/lib,' configure
#
# # configure checks for Magick++ but uses it to decide to use
# # symbols in MagickCore directly as well
perl -pi -e 's/-lMagick\+\+/-lGraphicsMagick++ -lGraphicsMagick/'
configure.ac
#
# # directly uses libxml, not just c++ wrappers
perl -pi -e 's/(libxml\+\+-2.6)/\1 libxml2/g' configure
<<
SetCPPFLAGS: -I%p/include/GraphicsMagick -I%p/lib/fontconfig2/include
-I%p/include/libxml2
SetLDFLAGS: -L%p/lib/fontconfig2/lib -lxml2
ConfigureParams: --without-libavcodec
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH" CC=clang
CXX=clang++
CompileScript: <<
#!/bin/sh -ev
libtoolize --ltdl --copy -f
autoreconf -if
./configure %c
make # -j1
<<
InstallScript: <<
# find %d -name "*.la" -exec perl -pi.bak -e 's| .*root-%f.* | |g' {} \;
make install prefix=%i
mkdir -p %i/share/doc/%n/examples/walk
install -p -m644 examples/*.sifz %i/share/doc/%n/examples
install -p -m644 examples/walk/*.lst %i/share/doc/%n/examples/walk
install -p -m644 examples/walk/*.jpg %i/share/doc/%n/examples/walk
install -p -m644 examples/walk/*.sifz %i/share/doc/%n/examples/walk
<<
SplitOff: <<
Package: %N-shlibs
Depends: <<
fontconfig2-shlibs (>= 2.8.0-4),
freetype219-shlibs (>= 2.3.12-1),
glib2-shlibs (>= 2.22.0-1),
glibmm2.4-shlibs (>= 2.22.0-1),
graphicsmagick,
graphicsmagick-shlibs,
libgettext8-shlibs,
libjpeg8-shlibs,
libmng2-shlibs,
libpng3-shlibs,
libsigc++2-shlibs (>=2.2.3-1),
libxml++2-shlibs (>= 2.26.1-2),
libxml2-shlibs (>= 2.6.32-1)
<<
Files: 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 1.0.0 %n (>= 0.63.00-1)
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (= %v-%r)
Replaces: %N (<< 0.62.02-1), %N-shlibs (<< 0.62.00-1)
Files: <<
bin/synfig-config
include
lib
<<
DocFiles: AUTHORS COPYING INSTALL NEWS README
BuildDependsOnly: true
<<
DocFiles: AUTHORS COPYING INSTALL NEWS README
DescDetail: <<
synfig is a vector based 2D animation renderer. It is designed to be capable of
producing feature-film quality animation.
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, and then again as of 0.61.09-3
<<
------------------------------------------------------------------------------
Got Input? Slashdot Needs You.
Take our quick survey online. Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
