Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv15059/10.4-public/unstable/main/finkinfo/graphics
Modified Files:
aview.info compface.info freetype2.info giflib.info glui.info
libungif.info potrace.info skencil.info tesseract.info
Added Files:
potrace.patch
Log Message:
sync
Index: libungif.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/libungif.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libungif.info 26 Feb 2006 23:10:44 -0000 1.2
+++ libungif.info 23 Apr 2008 07:48:52 -0000 1.3
@@ -9,6 +9,8 @@
Source: mirror:sourceforge:%n/%n-%v.tar.bz2
Source-MD5: 76865bc1bed90ecb5992a1edcc4d6c15
Patch: %n.patch
+NoSetMAKEFLAGS: true
+SetMAKEFLAGS: -j1
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
InstallScript: <<
Index: tesseract.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/tesseract.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tesseract.info 1 Jun 2007 03:58:53 -0000 1.1
+++ tesseract.info 23 Apr 2008 07:48:53 -0000 1.2
@@ -2,7 +2,7 @@
Version: 1.04b
Revision: 1001
-BuildDepends: libtiff
+BuildDepends: libtiff, fink (>= 0.24.12-1)
Depends: libtiff-shlibs, %N-data
GCC: 4.0
@@ -10,7 +10,8 @@
Source-MD5: c6f015f2f2c37b3e7e31b64eb295f798
SourceDirectory: %n-1.04
-Patch: %n.patch
+PatchFile: %n.patch
+PatchFile-MD5: 2cdcb0a2f2ad042bf5c992d5b502d33e
ConfigureParams: --disable-dependency-tracking
InstallScript: make install DESTDIR=%d
Index: giflib.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/giflib.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- giflib.info 28 Feb 2006 05:27:03 -0000 1.4
+++ giflib.info 23 Apr 2008 07:48:52 -0000 1.5
@@ -7,6 +7,8 @@
Replaces: libungif
Source: mirror:sourceforge:libungif/%n-%v.tar.bz2
Source-MD5: 827d338961482a986f39c7f114531636
+NoSetMAKEFLAGS: true
+SetMAKEFLAGS: -j1
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
InstallScript: <<
Index: glui.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/glui.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- glui.info 29 Dec 2007 14:22:19 -0000 1.3
+++ glui.info 23 Apr 2008 07:48:52 -0000 1.4
@@ -6,9 +6,11 @@
Source: http://www.cs.unc.edu/~rademach/%N/src/release/%N_v2_1_beta.tar.gz
Source-MD5: e8ab926ac22f3fbfe3c82f541b924496
Depends: %N-shlibs
-BuildDepends: freeglut, x11-dev
+BuildDepends: fink (>= 0.24.12-1), freeglut, x11-dev
+PatchFile: %n.patch
+PatchFile-MD5: cda893870e3d346f04c8489cd53df338
PatchScript: <<
- sed 's|@prefix@|%p|g' <%a/%n.patch | patch -p1
+ sed 's|@prefix@|%p|g' <%{PatchFile} | patch -p1
perl -pi -e 's|friend *GLUI|friend class GLUI|g' glui.h
<<
CompileScript: make
Index: potrace.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/potrace.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- potrace.info 20 Jan 2006 20:26:46 -0000 1.1
+++ potrace.info 23 Apr 2008 07:48:53 -0000 1.2
@@ -1,5 +1,5 @@
Package: potrace
-Version: 1.7
+Version: 1.8
Revision: 1
Description: Trace bitmaps into scalable vector graphics
DescDetail: <<
@@ -20,12 +20,18 @@
as a pre-processor for potrace, applying scaling and various filters
to an image before converting it to a bitmap. This is useful for
potracing greyscale and color images.
-
+<<
+DescPackaging: <<
+Includes upstream patch to improve XFig backend.
<<
Homepage: http://potrace.sourceforge.net
License: GPL
Maintainer: Daniel Macks <[EMAIL PROTECTED]>
+BuildDepends: fink (>= 0.24.12-1)
Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 8bfaabf935c03643a6875bde36fe6302
-ConfigureParams: --mandir='${prefix}/share/man' --disable-dependency-tracking
+Source-MD5: e73b45565737d64011612704dd4d9f86
+PatchFile: %n.patch
+PatchFile-MD5: 9178ac9357a61c2d40222f8f522baa77
+ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
+InstallScript: make install DESTDIR=%d
DocFiles: AUTHORS COPYING ChangeLog NEWS README
Index: freetype2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/freetype2.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- freetype2.info 21 Nov 2006 06:12:49 -0000 1.5
+++ freetype2.info 23 Apr 2008 07:48:52 -0000 1.6
@@ -1,14 +1,19 @@
Package: freetype2
Version: 2.1.4
Revision: 12
+BuildDepends: fink (>= 0.24.12-1)
# Depends: %N-shlibs (= %v-%r)
Conflicts: freetype2-hinting
Replaces: freetype2-hinting
BuildDependsOnly: True
Source: mirror:sourceforge:freetype/freetype-%v.tar.gz
Source-MD5: dd40b965b06d66749e53df9299633886
-Patch: %n.patch
-PatchScript: mv install install.sh
+PatchFile: %n.patch
+PatchFile-MD5: 69d6d48d50a15da5d516f5c00ceaf772
+PatchScript: <<
+ %{default_script}
+ mv install install.sh
+<<
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
CompileScript: <<
Index: aview.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/aview.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- aview.info 20 May 2007 20:55:20 -0000 1.3
+++ aview.info 23 Apr 2008 07:48:52 -0000 1.4
@@ -6,8 +6,9 @@
Source-MD5: 093f298e7787591e229b59d039c72f4d
SourceDirectory: %n-1.3.0
Depends: imagemagick (>= 5.5.1-13), netpbm-bin (>= 10.12-2), aalib-shlibs (>=
1.4rc5-12), ncurses (>= 5.4-20041023-1006), libncurses5-shlibs (>=
5.4-20041023-1006), x11
-BuildDepends: aalib (>= 1.4rc5-12), libncurses5, x11-dev, netpbm10, libjpeg,
libpng3, libtiff, libxml2, expat, tcltk-dev
-Patch: %n.patch
+BuildDepends: aalib (>= 1.4rc5-12), libncurses5, x11-dev, netpbm10, libjpeg,
libpng3, libtiff, libxml2, expat, tcltk-dev, fink (>= 0.24.12-1)
+PatchFile: %n.patch
+PatchFile-MD5: 43d1ca7f38c427fc7761d34506b7ebb3
ConfigureParams: --mandir=%i/share/man
DocFiles: ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO
Description: Ascii art image viewer
Index: compface.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/compface.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- compface.info 20 Jan 2006 20:26:46 -0000 1.1
+++ compface.info 23 Apr 2008 07:48:52 -0000 1.2
@@ -3,7 +3,9 @@
Revision: 2
Source: http://freshmeat.net/redir/compface/1439/url_tgz/%n-%v.tar.gz
Source-MD5: c45b54f67cc5d3580a18e4113219bc26
-Patch: %n.patch
+PatchFile: %n.patch
+PatchFile-MD5: 540fbed57037ee68a8ae8713599aad1f
+BuildDepends: fink (>= 0.24.12-1)
Depends: %N-shlibs (= %v-%r)
ConfigureParams: --mandir='${prefix}/share/man'
CompileScript: <<
Index: skencil.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/skencil.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- skencil.info 31 May 2006 14:26:49 -0000 1.5
+++ skencil.info 23 Apr 2008 07:48:53 -0000 1.6
@@ -1,36 +1,36 @@
Package: skencil
Version: 0.6.17
-Revision: 1002
+Revision: 1003
Maintainer: None <[EMAIL PROTECTED]>
BuildDepends: tcltk-dev
-Depends: python24 (>= 1:2.4.2-1004), pil-py24 (>= 1.1.4-1027) , numeric-py24,
tcltk, pyxml-py24, reportlab-py24 (>= 1.20-1011)
+Depends: python25, pil-py25, numeric-py25, tcltk, pyxml-py25, reportlab-py25
Conflicts: sketch (<= 0.6.15-3)
Replaces: sketch (<= 0.6.15-3)
Source: mirror:sourceforge:sketch/skencil-%v.tar.gz
Compilescript: <<
-python2.4 ./setup.py configure --prefix=%p --tk-flags="-L%p/lib -ltk -ltcl
-L/usr/X11R6/lib -lX11.6" --pax-no-xshm
-%p/bin/python2.4 ./setup.py build
+%p/bin/python2.5 ./setup.py configure --prefix=%p --tk-flags="-L%p/lib -ltk
-ltcl -L/usr/X11R6/lib -lX11.6" --pax-no-xshm
+%p/bin/python2.5 ./setup.py build
<<
Installscript: <<
-%p/bin/python2.4 ./setup.py install --prefix=%p --dest-dir=%d
+%p/bin/python2.5 ./setup.py install --prefix=%p --dest-dir=%d
rm %i/bin/*
echo "#! /bin/sh" > %i/bin/sketch
-echo "exec %p/bin/python2.4 %p/lib/%n-%v/skencil.py \$@" >> %i/bin/sketch
+echo "exec %p/bin/python2.5 %p/lib/%n-%v/skencil.py \$@" >> %i/bin/sketch
chmod +x %i/bin/sketch
echo "#! /bin/sh" > %i/bin/skencil
-echo "exec %p/bin/python2.4 %p/lib/%n-%v/skencil.py \$@" >> %i/bin/skencil
+echo "exec %p/bin/python2.5 %p/lib/%n-%v/skencil.py \$@" >> %i/bin/skencil
chmod +x %i/bin/skencil
echo "#! /bin/sh" > %i/bin/sk2ps
-echo "exec %p/bin/python2.4 %p/lib/%n-%v/sk2ps.py \$@" >> %i/bin/sk2ps
+echo "exec %p/bin/python2.5 %p/lib/%n-%v/sk2ps.py \$@" >> %i/bin/sk2ps
chmod +x %i/bin/sk2ps
echo "#! /bin/sh" > %i/bin/sk2ppm
-echo "exec %p/bin/python2.4 %p/lib/%n-%v/sk2ppm.py \$@" >> %i/bin/sk2ppm
+echo "exec %p/bin/python2.5 %p/lib/%n-%v/sk2ppm.py \$@" >> %i/bin/sk2ppm
chmod +x %i/bin/sk2ppm
echo "#! /bin/sh" > %i/bin/skconvert
-echo "exec %p/bin/python2.4 %p/lib/%n-%v/skconvert.py \$@" >> %i/bin/skconvert
+echo "exec %p/bin/python2.5 %p/lib/%n-%v/skconvert.py \$@" >> %i/bin/skconvert
chmod +x %i/bin/skconvert
echo "#! /bin/sh" > %i/bin/skshow
-echo "exec %p/bin/python2.4 %p/lib/%n-%v/skshow.py \$@" >> %i/bin/skshow
+echo "exec %p/bin/python2.5 %p/lib/%n-%v/skshow.py \$@" >> %i/bin/skshow
chmod +x %i/bin/skshow
<<
SetCPPFlags: -I/usr/X11R6/include
--- NEW FILE: potrace.patch ---
Index: potrace/ChangeLog
===================================================================
--- potrace/ChangeLog (revision 153)
+++ potrace/ChangeLog (revision 154)
@@ -1,5 +1,9 @@
ChangeLog
+ (2007/05/22) PS1 - xfig backend: added depth to opaque components
+ to avoid them floating to the background. Suggested by Rafael
+ Laboissiere.
+
v1.8 2007/04/09
(2007/04/08) PS1 - portability: use 'test' instead of '[' in shell
scripts.
Index: potrace/src/backend_xfig.c
===================================================================
--- potrace/src/backend_xfig.c (revision 153)
+++ potrace/src/backend_xfig.c (revision 154)
@@ -124,13 +124,13 @@
return n;
}
-/* do one path. First should be 1 on the very first path, else 0. */
-static int xfig_path(FILE *fout, potrace_curve_t *curve, trans_t t, int sign) {
+/* do one path. */
+static void xfig_path(FILE *fout, potrace_curve_t *curve, trans_t t, int sign,
int depth) {
int i;
dpoint_t *c;
int m = curve->n;
- fprintf(fout, "3 1 0 0 0 %d 50 0 20 0.000 0 0 0 %d\n", sign=='+' ? 32 : 33,
npoints(curve, m));
+ fprintf(fout, "3 1 0 0 0 %d %d 0 20 0.000 0 0 0 %d\n", sign=='+' ? 32 : 33,
depth, npoints(curve, m));
for (i=0; i<m; i++) {
c = curve->c[i];
@@ -154,15 +154,43 @@
break;
}
}
- return 0;
}
+/* render a whole tree */
+static void xfig_write_paths(FILE *fout, potrace_path_t *plist, trans_t t, int
depth) {
+ potrace_path_t *p, *q;
+
+ for (p=plist; p; p=p->sibling) {
+ xfig_path(fout, &p->curve, t, p->sign, depth);
+ for (q=p->childlist; q; q=q->sibling) {
+ xfig_path(fout, &q->curve, t, q->sign, depth >= 1 ? depth-1 : 0);
+ }
+ for (q=p->childlist; q; q=q->sibling) {
+ xfig_write_paths(fout, q->childlist, t, depth >= 2 ? depth-2 : 0);
+ }
+ }
+}
+
+/* calculate the depth of a tree. Call with d=0. */
+static int xfig_get_depth(potrace_path_t *plist) {
+ potrace_path_t *p;
+ int max =0;
+ int d;
+
+ for (p=plist; p; p=p->sibling) {
+ d = xfig_get_depth(p->childlist);
+ if (d > max) {
+ max = d;
+ }
+ }
+ return max + 1;
+}
+
/* ---------------------------------------------------------------------- */
/* Backend. */
/* public interface for XFIG */
int page_xfig(FILE *fout, potrace_path_t *plist, imginfo_t *imginfo) {
- potrace_path_t *p;
trans_t t;
double si, co;
double origx = imginfo->trans.orig[0] + imginfo->lmar;
@@ -174,6 +202,7 @@
pageformat_t *f;
int i;
int x0, y0, x1, y1; /* in xfig's coordinates */
+ int depth;
si = sin(info.angle/180*M_PI);
co = cos(info.angle/180*M_PI);
@@ -220,11 +249,21 @@
fprintf(fout, "0 33 #%06x\n", info.fillcolor);
fprintf(fout, "6 %d %d %d %d\n", x0-75, y1-35, x1+75, y0+35); /* bounding
box */
+ /* determine depth of the tree */
+ depth = xfig_get_depth(plist);
+
+ /* figure out appropriate xfig starting depth. Note: xfig only has 1000
depths available */
+ if (depth <= 40) {
+ depth = 50;
+ } else if (depth < 990) {
+ depth += 10;
+ } else {
+ depth = 999;
+ }
+
/* write paths. Note: can never use "opticurve" with this backend -
it just does not approximate Bezier curves closely enough. */
- list_forall (p, plist) {
- xfig_path(fout, &p->curve, t, p->sign);
- }
+ xfig_write_paths(fout, plist, t, depth);
fprintf(fout, "-6\n"); /* end bounding box */
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
