Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory vz-cvs-3.sog:/tmp/cvs-serv30549
Modified Files:
xv.info xv.patch
Log Message:
a few libpng cleanups (still not clean for 15)
Index: xv.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/xv.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- xv.patch 11 Aug 2011 16:28:44 -0000 1.5
+++ xv.patch 11 Aug 2011 16:55:20 -0000 1.6
@@ -161,8 +161,52 @@
int j;
diff -Nurd -x'*~' xv-3.10a.orig/xvpng.c xv-3.10a/xvpng.c
--- xv-3.10a.orig/xvpng.c 2007-05-13 20:53:28.000000000 -0400
-+++ xv-3.10a/xvpng.c 2011-08-11 12:18:52.000000000 -0400
-@@ -1165,7 +1165,7 @@
++++ xv-3.10a/xvpng.c 2011-08-11 12:38:57.000000000 -0400
+@@ -32,6 +32,7 @@
+ #ifdef HAVE_PNG
+
+ #include "png.h"
++#include "zlib.h"
+
+ /*** Stuff for PNG Dialog box ***/
+ #define PWIDE 318
+@@ -458,7 +459,7 @@
+ FatalError(software);
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ return -1;
+ }
+@@ -921,7 +922,7 @@
+ FatalError("malloc failure in LoadPNG");
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ fclose(fp);
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ if (!read_anything) {
+@@ -985,7 +986,7 @@
+ ", %sinterlaced. (%d bytes)",
+ info_ptr->interlace_type ? "" : "non-", filesize);
+
+- sprintf(pinfo->shrtInfo, "%lux%lu PNG", info_ptr->width, info_ptr->height);
++ sprintf(pinfo->shrtInfo, "%ux%u PNG", info_ptr->width, info_ptr->height);
+
+ if (info_ptr->bit_depth < 8)
+ png_set_packing(png_ptr);
+@@ -1143,7 +1144,7 @@
+ {
+ SetISTR(ISTR_WARNING,"%s: libpng error: %s", fbasename, message);
+
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+
+@@ -1165,7 +1166,7 @@
VersionInfoPNG() /* GRR 19980605 */
{
fprintf(stderr, " Compiled with libpng %s; using libpng %s.\n",
Index: xv.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/xv.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- xv.info 11 Aug 2011 16:28:44 -0000 1.13
+++ xv.info 11 Aug 2011 16:55:20 -0000 1.14
@@ -1,7 +1,7 @@
Package: xv
Version: 3.10a
-Revision: 29
+Revision: 30
#Maintainer: Eric Lee <e...@cs.rwth-aachen.de>
Maintainer: Daniel Macks <dma...@netspace.org>
@@ -48,7 +48,7 @@
#^-- incorporated into .patch
PatchFile: %n.patch
-PatchFile-MD5: 43f50e84f19015f2b89f4eef4a6356b4
+PatchFile-MD5: 149800a45bab1f2d8e5cfc2041f7222d
PatchScript: <<
# first apply public 3rd-party stuff
# gunzip --stdout
../xv-3.10a+jp-extension-rev5.3.3+FLmask.v2.1+png+misc.patch.gz | patch -p1
@@ -94,6 +94,9 @@
Should re-incorporate parts of old .patch suite...eventually...
Upgrade libpng support for runtime version introspection.
+
+ Fix some libpng14 deprecation warnings. These became errors in
+ libpng15 (cannot upgrade dep until all fixed).
<<
License: Restrictive
Homepage: http://www.trilon.com/xv/index.html
------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system,
user administration capabilities and model configuration. Take
the hassle out of deploying and managing Subversion and the
tools developers use with it.
http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
