Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv9243
Modified Files:
libming0-shlibs.info libming0-shlibs.patch
libming1-shlibs.info
Added Files:
libming1-shlibs.patch
Log Message:
libpng upgrade
--- NEW FILE: libming1-shlibs.patch ---
diff -Nurd -x'*~' ming-0.4.2.orig/src/blocks/pngdbl.c
ming-0.4.2/src/blocks/pngdbl.c
--- ming-0.4.2.orig/src/blocks/pngdbl.c 2008-04-09 17:43:50.000000000 -0400
+++ ming-0.4.2/src/blocks/pngdbl.c 2011-07-30 13:08:41.000000000 -0400
@@ -59,7 +59,7 @@
}
static int pngReadFunc(png_structp png, unsigned char *buf, int len)
-{ SWFInput input = (SWFInput) png->io_ptr;
+{ SWFInput input = (SWFInput) png_get_io_ptr(png);
return SWFInput_read(input, buf, len);
}
@@ -125,7 +125,7 @@
return 0;
}
- if(setjmp(png_ptr->jmpbuf))
+ if(setjmp(png_jmpbuf(png_ptr)))
{
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
return 0;
diff -Nurd -x'*~' ming-0.4.2.orig/util/png2dbl.c ming-0.4.2/util/png2dbl.c
--- ming-0.4.2.orig/util/png2dbl.c 2007-10-30 15:26:56.000000000 -0400
+++ ming-0.4.2/util/png2dbl.c 2011-07-30 13:19:32.000000000 -0400
@@ -87,7 +87,7 @@
error("Couldn't create end_info\n");
}
- if(setjmp(png_ptr->jmpbuf))
+ if(setjmp(png_jmpbuf(png_ptr)))
{
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
fclose(fp);
Index: libming1-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libming1-shlibs.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libming1-shlibs.info 6 Oct 2009 12:13:40 -0000 1.3
+++ libming1-shlibs.info 30 Jul 2011 17:35:47 -0000 1.4
@@ -1,10 +1,12 @@
Package: libming1-shlibs
Version: 0.4.2
-Revision: 2
-BuildDepends: autoconf (>= 2.60), automake1.9, fink (>= 0.24.12-1),
freetype219, giflib, libpng3, libtool14, pkgconfig, x11-dev
-Depends: freetype219-shlibs, giflib-shlibs, libpng3-shlibs
+Revision: 3
+BuildDepends: autoconf (>= 2.60), automake1.11, fink (>= 0.24.12-1),
freetype219, giflib, libpng15, libtool2, pkgconfig, x11-dev
+Depends: freetype219-shlibs, giflib-shlibs, libpng15-shlibs
Source: mirror:sourceforge:ming/ming-%v.tar.gz
Source-MD5: b44da4985037241eda6da13d724eb935
+PatchFile: %n.patch
+PatchFile-MD5: 8ce6ed88a6a4911f797e0e7749c162f3
ConfigureParams: --with-freetype-config=%p/lib/freetype219/bin/freetype-config
--disable-python --disable-perl --disable-php --disable-tcl --with-pic
--enable-shared --enable-static --mandir=%p/share/man
--disable-dependency-tracking
CompileScript: <<
#!/bin/bash -ev
@@ -41,7 +43,7 @@
SplitOff2: <<
Package: libming-utils
Conflicts: swftools
- Depends: libming1-shlibs (>= %v-%r), freetype219-shlibs, giflib-shlibs,
libpng3-shlibs
+ Depends: libming1-shlibs (>= %v-%r), freetype219-shlibs, giflib-shlibs,
libpng15-shlibs
Files: <<
bin
share/man/man1
Index: libming0-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libming0-shlibs.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- libming0-shlibs.info 21 Sep 2009 01:23:52 -0000 1.13
+++ libming0-shlibs.info 30 Jul 2011 17:35:47 -0000 1.14
@@ -1,6 +1,6 @@
Package: libming0-shlibs
Version: 0.4.0.beta5
-Revision: 9
+Revision: 10
###
BuildDepends: <<
autoconf (>= 2.63),
@@ -8,7 +8,7 @@
fink (>= 0.24.12-1),
freetype219,
giflib,
- libpng3,
+ libpng15,
libtool2,
pkgconfig,
x11-dev
@@ -16,14 +16,14 @@
Depends: <<
freetype219-shlibs,
giflib-shlibs,
- libpng3-shlibs
+ libpng15-shlibs
<<
###
Source: mirror:sourceforge:ming/ming-%v.tar.gz
Source-MD5: d092c3322b91b965363b537f2143997f
###
PatchFile: %n.patch
-PatchFile-MD5: 8654b5c8193cae9a5becd7ae953ec54d
+PatchFile-MD5: 459a98c65daeaf7c1bda7fdaba1ab875
###
SetLDFLAGS: -L%p/lib/freetype219/lib
ConfigureParams: --with-freetype-config=%p/lib/freetype219/bin/freetype-config
--disable-python --disable-perl --disable-php --disable-tcl --with-pic
--enable-shared --enable-static --mandir=%p/share/man
--disable-dependency-tracking
@@ -67,7 +67,7 @@
libming0-shlibs (>= %v-%r),
freetype219-shlibs,
giflib-shlibs,
- libpng3-shlibs
+ libpng15-shlibs
<<
Files: <<
bin
Index: libming0-shlibs.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libming0-shlibs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libming0-shlibs.patch 21 Sep 2009 01:23:52 -0000 1.3
+++ libming0-shlibs.patch 30 Jul 2011 17:35:47 -0000 1.4
@@ -23,6 +23,27 @@
TTF_SOURCE = ttffont.c
endif
+diff -ru ming-0.4.0.beta5.orig/src/blocks/pngdbl.c
ming-0.4.0.beta5/src/blocks/pngdbl.c
+--- ming-0.4.0.beta5.orig/src/blocks/pngdbl.c 2007-07-15 15:50:43.000000000
-0400
++++ ming-0.4.0.beta5/src/blocks/pngdbl.c 2011-07-30 13:29:34.000000000
-0400
+@@ -43,7 +43,7 @@
+ }
+
+ static int pngReadFunc(png_structp png, unsigned char *buf, int len)
+-{ SWFInput input = (SWFInput) png->io_ptr;
++{ SWFInput input = (SWFInput) png_get_io_ptr(png);
+ return SWFInput_read(input, buf, len);
+ }
+
+@@ -109,7 +109,7 @@
+ return 0;
+ }
+
+- if(setjmp(png_ptr->jmpbuf))
++ if(setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ return 0;
diff -ru ming-0.4.0.beta5.orig/test/actionscript/Makefile.am
ming-0.4.0.beta5/test/actionscript/Makefile.am
--- ming-0.4.0.beta5.orig/test/actionscript/Makefile.am 2007-09-17
07:35:54.000000000 -0400
+++ ming-0.4.0.beta5/test/actionscript/Makefile.am 2009-09-20
21:12:41.000000000 -0400
@@ -110,3 +131,15 @@
gif2mask_SOURCES = gif2mask.c
gif2mask_LDADD = $(top_builddir)/src/libming.la
+diff -ru ming-0.4.0.beta5.orig/util/png2dbl.c ming-0.4.0.beta5/util/png2dbl.c
+--- ming-0.4.0.beta5.orig/util/png2dbl.c 2007-07-15 15:40:03.000000000
-0400
++++ ming-0.4.0.beta5/util/png2dbl.c 2011-07-30 13:30:36.000000000 -0400
+@@ -87,7 +87,7 @@
+ error("Couldn't create end_info\n");
+ }
+
+- if(setjmp(png_ptr->jmpbuf))
++ if(setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ fclose(fp);
------------------------------------------------------------------------------
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
