Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1151/stable/main/finkinfo/graphics
Modified Files:
sng.info sng.patch
Log Message:
bkacport libpng upgrade from 10.[78]
Index: sng.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/sng.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sng.patch 17 Oct 2011 12:38:52 -0000 1.3
+++ sng.patch 3 Jun 2013 18:47:42 -0000 1.4
@@ -10,3 +10,47 @@
do
if test -f ${dir}/rgb.txt
then
+--- a/sngd.c
++++ b/sngd.c
+@@ -11,6 +11,18 @@
+ #include "config.h" /* for RGBTXT */
+ #include "png.h"
+ #include "sng.h"
++
++/* cope with API issues */
++#if PNG_LIBPNG_VER_MAJOR == 1
++ #if PNG_LIBPNG_VER_MINOR <= 2
++ #define TRANS_COLOR trans_values
++ #define TRANS_ALPHA trans
++ #endif
++ #if PNG_LIBPNG_VER_MINOR >= 4
++ #define TRANS_COLOR trans_color
++ #define TRANS_ALPHA trans_alpha
++ #endif
++#endif
+
+ png_structp png_ptr;
+ png_infop info_ptr;
+@@ -794,17 +809,17 @@
+ fprintf(fpout, "tRNS {\n");
+ switch (info_ptr->color_type) {
+ case PNG_COLOR_TYPE_GRAY:
+- fprintf(fpout, " gray: %u;\n", info_ptr->trans_values.gray);
++ fprintf(fpout, " gray: %u;\n", info_ptr->TRANS_COLOR.gray);
+ break;
+ case PNG_COLOR_TYPE_RGB:
+ fprintf(fpout, " red: %u; green: %u; blue: %u;\n",
+- info_ptr->trans_values.red,
+- info_ptr->trans_values.green,
+- info_ptr->trans_values.blue);
++ info_ptr->TRANS_COLOR.red,
++ info_ptr->TRANS_COLOR.green,
++ info_ptr->TRANS_COLOR.blue);
+ break;
+ case PNG_COLOR_TYPE_PALETTE:
+ for (i = 0; i < info_ptr->num_trans; i++)
+- fprintf(fpout, " %u", info_ptr->trans[i]);
++ fprintf(fpout, " %u", info_ptr->TRANS_ALPHA[i]);
+ break;
+ case PNG_COLOR_TYPE_GRAY_ALPHA:
+ case PNG_COLOR_TYPE_RGB_ALPHA:
Index: sng.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/sng.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sng.info 21 Aug 2012 15:47:41 -0000 1.5
+++ sng.info 3 Jun 2013 18:47:42 -0000 1.6
@@ -16,14 +16,14 @@
Package: sng
Version: 1.0.5
-Revision: 1
+Revision: 2
Maintainer: Max Horn <[email protected]>
Source: mirror:sourceforge:%n/%n-%v.tar.gz
Source-MD5: 798502dcc90511d547549d9b3504b4af
-BuildDepends: libpng3, fink (>= 0.24.12)
-Depends: libpng3-shlibs
+BuildDepends: libpng14
+Depends: libpng14-shlibs
PatchFile: %n.patch
-PatchFile-MD5: b5c21aea4b5e452e54adbdf2e269bf2b
+PatchFile-MD5: 89e86b3d18f8c0e0754fe6793a76d4e4
ConfigureParams: --mandir=%p/share/man
InstallScript: make install DESTDIR=%d
DocFiles: README INSTALL ChangeLog COPYING NEWS AUTHORS
@@ -44,8 +44,9 @@
The configure patch ensures that rgb.txt is found in more locations,
in particular, that it is found on 10.5.
- Will require patching to build against newer libpng. See:
-
http://sourceforge.net/mailarchive/forum.php?thread_name=20110615220041.GA19429%40thyrsus.com&forum_name=sng-devel
+ Patches to build against libpng14:
+ 91e696d4fa127bd2d3744ff260be39c72b02ed07
+ a69387ce94d6c6d9e1fb017855d98cc8f633b8f9
<<
License: OSI-Approved
Homepage: http://sng.sourceforge.net/
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
