Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19298
Modified Files:
h5utils.info harminv.info libctl.info meep.info
Added Files:
h5utils.patch
Log Message:
Dependencies updated. h5utils.patch for libpng16 thanks to Hanspeter
Niederstrasser.
Index: meep.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/meep.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- meep.info 20 Oct 2012 20:49:55 -0000 1.1
+++ meep.info 13 Aug 2013 09:25:59 -0000 1.2
@@ -2,15 +2,15 @@
Package: meep%type_pkg[-mpi]
Type: -mpi (boolean)
Version: 1.2
-Revision: 1
+Revision: 3
Source: mirror:custom:%{Ni}-%v.tar.gz
CustomMirror: <<
Primary: http://ab-initio.mit.edu/%{Ni}/
Secondary: http://ab-initio.mit.edu/%{Ni}/old/
<<
Source-MD5: 80361e2a63419797f4edc8ebd30a4df0
-BuildDepends: gcc47-compiler, libctl (>= 3.0.3-5), hdf5.7, libtool2,
libiconv-dev, gmp5, szip, gsl, fftw3, guile18, guile18-dev, (%type_raw[-mpi] =
-mpi) openmpi
-Depends: gcc47-shlibs, harminv (>= 1.3.1-6), hdf5.7-shlibs, libtool2-shlibs,
libiconv, gmp5-shlibs, szip-shlibs, gsl-shlibs, fftw3-shlibs, h5utils,
(%type_raw[-mpi] = -mpi) openmpi-shlibs
+BuildDepends: gcc48-compiler, libctl (>= 3.0.3-5), hdf5.8, libtool2,
libiconv-dev, gmp5, szip, gsl, fftw3, guile18, guile18-dev, (%type_raw[-mpi] =
-mpi) openmpi
+Depends: gcc47-shlibs, harminv (>= 1.3.1-6), hdf5.8-shlibs, libtool2-shlibs,
libiconv, gmp5-shlibs, szip-shlibs, gsl-shlibs, fftw3-shlibs, h5utils,
(%type_raw[-mpi] = -mpi) openmpi-shlibs
Conflicts: meep, meep-mpi
Replaces: meep, meep-mpi
#SetLDFLAGS: -L%p/lib/hdf5-18/lib/
Index: libctl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/libctl.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libctl.info 20 Oct 2012 20:49:55 -0000 1.1
+++ libctl.info 13 Aug 2013 09:25:59 -0000 1.2
@@ -1,10 +1,10 @@
Package: libctl
Version: 3.2.1
-Revision: 1
+Revision: 2
Source: http://ab-initio.mit.edu/%n/%n-%v.tar.gz
Source-MD5: 0f18d282464d6129e74c20911194765c
-BuildDepends: guile18-dev, gcc47-compiler, libtool2, libiconv-dev, gmp5
-Depends: guile18, guile18-libs, guile18-shlibs, gcc47-shlibs, libtool2-shlibs,
libiconv, gmp5-shlibs
+BuildDepends: guile18-dev, gcc48-compiler, libtool2, libiconv-dev, gmp5
+Depends: guile18, guile18-libs, guile18-shlibs, gcc48-shlibs, libtool2-shlibs,
libiconv, gmp5-shlibs
BuildDependsOnly: true
ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
F77=gfortran
CompileScript: <<
Index: h5utils.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/h5utils.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- h5utils.info 20 Oct 2012 20:49:55 -0000 1.1
+++ h5utils.info 13 Aug 2013 09:25:59 -0000 1.2
@@ -1,12 +1,14 @@
Package: h5utils
Version: 1.12.1
-Revision: 1
+Revision: 2
Maintainer: Martin Costabel <costa...@wanadoo.fr>
# Earlier version by Aurelien Chanudet <aurelien.chanu...@m4x.org>
-Depends: hdf5.7-shlibs, libpng14-shlibs, libjpeg8-shlibs
-BuildDepends: hdf5.7, libpng14, libjpeg8
+Depends: hdf5.8-shlibs, libpng16-shlibs, libmatheval
+BuildDepends: hdf5.8, libpng16, libmatheval-shlibs
Source: http://ab-initio.mit.edu/%n/%n-%v.tar.gz
Source-MD5: 46a6869fee6e6bf87fbba9ab8a99930e
+PatchFile: %n.patch
+PatchFile-MD5: ccefb7e6148ab4d5126428aa7474a030
ConfigureParams: --mandir=%i/share/man --without-octave
--disable-dependency-tracking
DocFiles: AUTHORS COPYING ChangeLog NEWS README
Description: Convert HDF5 datasets into various formats
@@ -18,6 +20,6 @@
the formats required by other free visualization software (e.g.
plain text, Vis5d, and VTK). Written by Steven G. Johnson.
<<
-DescPort: Doesn't build with libpng15.
+DescPort: Patch from debian for libpng >= 15.
License: GPL
Homepage: http://ab-initio.mit.edu/wiki/index.php/H5utils
Index: harminv.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/harminv.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- harminv.info 20 Oct 2012 20:49:55 -0000 1.1
+++ harminv.info 13 Aug 2013 09:25:59 -0000 1.2
@@ -1,10 +1,10 @@
Package: harminv
Version: 1.3.1
-Revision: 7
+Revision: 8
Source: http://ab-initio.mit.edu/%n/%n-%v.tar.gz
Source-MD5: d3f49f1c90856b3b2e8b77dc4a99c37a
-BuildDepends: gcc47-compiler
-Depends: gcc47-shlibs
+BuildDepends: gcc48-compiler
+Depends: gcc48-shlibs
ConfigureParams: --mandir=%p/share/man -with-blas="-Wl,-framework,Accelerate"
-with-lapack="-Wl,-framework,Accelerate" --disable-dependency-tracking
F77=gfortran
InstallScript: make install DESTDIR=%d
DocFiles: AUTHORS COPYING COPYRIGHT ChangeLog README
--- NEW FILE: h5utils.patch ---
--- a/writepng.c.orig 2009-06-13 06:58:50.000000000 +1000
+++ b/writepng.c 2012-10-20 22:16:09.000000000 +1100
@@ -240,6 +240,8 @@ void writepng(char *filename,
double skewsin = sin(skew), skewcos = cos(skew);
REAL minoverlay = 0, maxoverlay = 0;
png_byte mask_byte;
+ png_colorp palette;
+
/* we must use direct color for translucent overlays */
if (overlay)
@@ -309,7 +311,7 @@ void writepng(char *filename,
}
/* Set error handling. REQUIRED if you aren't supplying your own *
* error hadnling functions in the png_create_write_struct() call. */
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
/* If we get here, we had a problem reading the file */
fclose(fp);
png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
@@ -334,8 +336,6 @@ void writepng(char *filename,
PNG_INTERLACE_NONE,
PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
else {
- png_colorp palette;
-
png_set_IHDR(png_ptr, info_ptr, width, height, 8 /* bit_depth */ ,
PNG_COLOR_TYPE_PALETTE,
PNG_INTERLACE_NONE,
@@ -434,7 +434,8 @@ void writepng(char *filename,
png_write_end(png_ptr, info_ptr);
/* if you malloced the palette, free it here */
- free(info_ptr->palette);
+ if (eight_bit)
+ png_free(png_ptr, palette);
/* if you allocated any text comments, free them here */
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
