Revision: 76603 http://trac.macports.org/changeset/76603 Author: mas@macports.org Date: 2011-03-01 16:52:58 -0800 (Tue, 01 Mar 2011) Log Message: ----------- netpbm: update to 10.47.26 (upstream has incorporated one of our patches) Modified Paths: -------------- trunk/dports/graphics/netpbm/Portfile Removed Paths: ------------- trunk/dports/graphics/netpbm/files/patch-pngtopnm.c.diff Modified: trunk/dports/graphics/netpbm/Portfile =================================================================== --- trunk/dports/graphics/netpbm/Portfile 2011-03-02 00:29:01 UTC (rev 76602) +++ trunk/dports/graphics/netpbm/Portfile 2011-03-02 00:52:58 UTC (rev 76603) @@ -3,9 +3,9 @@ PortSystem 1.0 name netpbm -version 10.47.25 -revision 1 -svn.revision 1391 +version 10.47.26 +revision 0 +svn.revision 1402 categories graphics maintainers mas openmaintainer description Image manipulation @@ -36,8 +36,7 @@ svn.url http://${name}.svn.sourceforge.net/svnroot/${name}/stable worksrcdir stable -patchfiles patch-pngtopnm.c.diff \ - patch-pm_config.in.h.diff \ +patchfiles patch-pm_config.in.h.diff \ patch-lib-Makefile.diff post-patch { Deleted: trunk/dports/graphics/netpbm/files/patch-pngtopnm.c.diff =================================================================== --- trunk/dports/graphics/netpbm/files/patch-pngtopnm.c.diff 2011-03-02 00:29:01 UTC (rev 76602) +++ trunk/dports/graphics/netpbm/files/patch-pngtopnm.c.diff 2011-03-02 00:52:58 UTC (rev 76603) @@ -1,46 +0,0 @@ ---- converter/other/pngtopnm.c.orig 2009-09-27 23:44:29.000000000 +0200 -+++ converter/other/pngtopnm.c 2011-01-25 12:06:08.000000000 +0100 -@@ -32,6 +32,14 @@ - #include "shhopt.h" - #include "pnm.h" - -+/* Hack copied over from pnmtopng.c */ -+#if PNG_LIBPNG_VER >= 10400 -+#define TRANS_ALPHA trans_alpha -+#else -+#define TRANS_ALPHA trans -+#endif -+ -+ - enum alpha_handling {ALPHA_NONE, ALPHA_ONLY, ALPHA_MIX}; - - struct cmdlineInfo { -@@ -725,8 +733,8 @@ - for (i = 0, foundGray = FALSE; - i < info_ptr->num_trans && !foundGray; - ++i) { -- if (info_ptr->trans[i] != 0 && -- info_ptr->trans[i] != maxval) { -+ if (info_ptr->TRANS_ALPHA[i] != 0 && -+ info_ptr->TRANS_ALPHA[i] != maxval) { - foundGray = TRUE; - } - } -@@ -798,7 +806,7 @@ - unsigned int i; - trans_mix = TRUE; - for (i = 0; i < info_ptr->num_trans; ++i) -- if (info_ptr->trans[i] != 0 && info_ptr->trans[i] != 255) { -+ if (info_ptr->TRANS_ALPHA[i] != 0 && info_ptr->TRANS_ALPHA[i] != 255) { - trans_mix = FALSE; - break; - } -@@ -1061,7 +1069,7 @@ - setXel(&xelrow[col], fgColor, bgColor, alphaHandling, - (pngxP->info_ptr->valid & PNG_INFO_tRNS) && - index < pngxP->info_ptr->num_trans ? -- pngxP->info_ptr->trans[index] : maxval); -+ pngxP->info_ptr->TRANS_ALPHA[index] : maxval); - } - break; -