Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv5645

Modified Files:
        netpbm10.info netpbm10.patch 
Log Message:
sync. w/ 10.!4/stable, validated on powerpc-darwin8


Index: netpbm10.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/graphics/netpbm10.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- netpbm10.patch      11 Jul 2011 04:08:32 -0000      1.1
+++ netpbm10.patch      10 Dec 2011 00:07:33 -0000      1.2
@@ -1,7 +1,7 @@
-diff -Naur netpbm-10.12.old/Makefile.config.fink 
netpbm-10.12.new/Makefile.config.fink
---- netpbm-10.12.old/Makefile.config.fink      Thu Jan  1 09:00:00 1970
-+++ netpbm-10.12.new/Makefile.config.fink      Wed Dec 11 02:34:55 2002
-@@ -0,0 +1,19 @@
+diff -Naur netpbm-10.35.81/Makefile.config.fink 
netpbm-10.35.81-patched/Makefile.config.fink
+--- netpbm-10.35.81/Makefile.config.fink       1969-12-31 19:00:00.000000000 
-0500
++++ netpbm-10.35.81-patched/Makefile.config.fink       2011-07-20 
07:25:27.000000000 -0400
+@@ -0,0 +1,18 @@
 +#
 +# Configuration for fink
 +#
@@ -20,19 +20,19 @@
 +JPEGLIB               = libjpeg.dylib
 +PNGLIB                = libpng.dylib
 +ZLIB          = libz.dylib
-+
---- netpbm-10.18.old/buildtools/installnetpbm.pl       Tue Sep  9 12:47:00 2003
-+++ netpbm-10.18.new/buildtools/installnetpbm.pl       Tue Oct 14 11:54:06 2003
-@@ -105,7 +105,7 @@
+diff -Naur netpbm-10.35.81/buildtools/installnetpbm.pl 
netpbm-10.35.81-patched/buildtools/installnetpbm.pl
+--- netpbm-10.35.81/buildtools/installnetpbm.pl        2007-01-14 
21:50:02.000000000 -0500
++++ netpbm-10.35.81-patched/buildtools/installnetpbm.pl        2011-07-20 
07:25:27.000000000 -0400
+@@ -117,7 +117,7 @@
      } elsif ($ENV{OSTYPE} && $ENV{OSTYPE} eq "msdosdjgpp") {
          $default = "/dev/env/DJDIR";
      } else {
 -        $default = "/usr/local/netpbm";
-+        $default = "/sw";
++        $default = "@PREFIX@";
      }
  
      my $response = prompt("install prefix", $default);
-@@ -548,7 +548,7 @@
+@@ -572,7 +572,7 @@
      my $manDir;
  
      while (!$manDir) {
@@ -41,7 +41,7 @@
  
          my $response = prompt("man page directory", $default);
  
-@@ -747,9 +747,9 @@
+@@ -771,9 +771,9 @@
  
      print("\n");
  
@@ -51,30 +51,12 @@
 -    makeInManwebPath("$manDir/web");
 +#    makeInManwebPath("$manDir/web");
      
+     $$mandirR = $manDir;
  }
- 
---- netpbm-10.25/converter/other/pstopnm.c.CAN-2005-2471       2004-06-23 
04:22:33.000000000 +0200
-+++ netpbm-10.25/converter/other/pstopnm.c     2005-08-09 08:41:42.000000000 
+0200
-@@ -702,13 +702,13 @@
- 
-     if (verbose) {
-         pm_message("execing '%s' with args '%s' (arg 0), "
--                   "'%s', '%s', '%s', '%s', '%s', '%s', '%s'",
-+                   "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'",
-                    ghostscriptProg, arg0,
--                   deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-");
-+                   deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", 
"-dPARANOIDSAFER", "-");
-     }
- 
-     execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q",
--          "-dNOPAUSE", "-", NULL);
-+          "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL);
-     
-     pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)",
-              ghostscriptProg, errno, strerror(errno));
---- netpbm-10.26.12/converter/other/pnmtopng.c.pnmtopng        2004-08-28 
04:53:12.000000000 +0200
-+++ netpbm-10.26.12/converter/other/pnmtopng.c 2005-09-16 14:17:47.129390456 
+0200
-@@ -159,7 +159,7 @@
+diff -Naur netpbm-10.35.81/converter/other/pnmtopng.c 
netpbm-10.35.81-patched/converter/other/pnmtopng.c
+--- netpbm-10.35.81/converter/other/pnmtopng.c 2010-12-10 13:19:40.000000000 
-0500
++++ netpbm-10.35.81-patched/converter/other/pnmtopng.c 2011-07-20 
07:25:27.000000000 -0400
+@@ -527,7 +527,7 @@
                        unsigned int * const bestMatchP) {
      
      unsigned int paletteIndex;
@@ -82,8 +64,20 @@
 +    unsigned int bestIndex = 0;
      unsigned int bestMatch;
  
-     bestMatch = UINT_MAX;
-@@ -1566,7 +1566,7 @@
+     assert(paletteSize > 0);
+@@ -1427,9 +1427,9 @@
+     colorhist_vector chv;
+     unsigned int colors;
+ 
+-    gray * alphas_of_color[MAXPALETTEENTRIES];
++    gray * alphas_of_color[MAXPALETTEENTRIES + 1];
+     unsigned int alphas_first_index[MAXPALETTEENTRIES];
+-    unsigned int alphas_of_color_cnt[MAXPALETTEENTRIES];
++    unsigned int alphas_of_color_cnt[MAXPALETTEENTRIES + 1];
+  
+     getChv(ifP, rasterPos, cols, rows, maxval, format, MAXCOLORS, 
+            &chv, &colors);
+@@ -2348,7 +2348,7 @@
        /* The color part of the color/alpha palette passed to the PNG
           compressor 
        */
@@ -92,17 +86,27 @@
  
    gray trans_pnm[MAXCOLORS];
    png_byte  trans[MAXCOLORS];
---- netpbm-10.26.12/converter/other/pnmtopng.c
-+++ netpbm-10.26.12/converter/other/pnmtopng.c
-@@ -913,9 +913,9 @@
-     colorhist_vector chv;
-     unsigned int colors;
+diff -Naur netpbm-10.35.81/lib/libpbm3.c netpbm-10.35.81-patched/lib/libpbm3.c
+--- netpbm-10.35.81/lib/libpbm3.c      2008-03-28 14:58:06.000000000 -0400
++++ netpbm-10.35.81-patched/lib/libpbm3.c      2011-07-20 07:25:27.000000000 
-0400
+@@ -117,7 +117,7 @@
+             ) ];
+     */
+ 
+-    typedef int v8qi __attribute__ ((mode(V8QI)));
++    typedef int v8qi __attribute__ ((vector_size(8)));
+     typedef int di __attribute__ ((mode(DI)));
+ 
+     di const zero64 = 0;        /* to clear with PXOR */
+diff -Naur netpbm-10.35.81/pm_config.in.h 
netpbm-10.35.81-patched/pm_config.in.h
+--- netpbm-10.35.81/pm_config.in.h     2006-10-18 14:29:13.000000000 -0400
++++ netpbm-10.35.81-patched/pm_config.in.h     2011-07-20 07:25:27.000000000 
-0400
+@@ -68,7 +68,7 @@
+ #define RGB_DB3 "PBMplus_Dir:RGB.TXT"
+ #else
+ #define RGB_DB1 "/usr/lib/X11/rgb.txt"
+-#define RGB_DB2 "/usr/share/X11/rgb.txt"
++#define RGB_DB2 "/usr/X11/share/X11/rgb.txt"
+ #define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt"
+ #endif
  
--    gray *alphas_of_color[MAXPALETTEENTRIES];
-+    gray *alphas_of_color[MAXPALETTEENTRIES + 1];
-     unsigned int alphas_first_index[MAXPALETTEENTRIES];
--    unsigned int alphas_of_color_cnt[MAXPALETTEENTRIES];
-+    unsigned int alphas_of_color_cnt[MAXPALETTEENTRIES + 1];
-  
-     getChv(ifP, imagepos, cols, rows, maxval, format, MAXCOLORS, 
-            &chv, &colors);

Index: netpbm10.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/graphics/netpbm10.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- netpbm10.info       11 Jul 2011 04:08:32 -0000      1.1
+++ netpbm10.info       10 Dec 2011 00:07:33 -0000      1.2
@@ -1,21 +1,20 @@
 Package: netpbm10
-Version: 10.26.60
+Version: 10.35.81
 Revision: 1
-BuildDepends: libjpeg, libpng3, libtiff, fink (>= 0.24.12-1)
+BuildDepends: libjpeg8, libpng3, libtiff, fink (>= 0.24.12-1)
 Depends: %N-shlibs (= %v-%r)
 Replaces: netpbm
 Conflicts: netpbm
 BuildDependsOnly: True
 Source: mirror:sourceforge:netpbm/netpbm-%v.tgz
-Source-MD5: deff5832271d724b07837f172527dddf
+Source-MD5: d02c5681d36ab4d58747363d7e0b3e4e
 NoSetMAKEFLAGS: true
 NoSetLDFLAGS: true
 SetLIBRARY_PATH: %p/lib
 PatchFile: %n.patch
-PatchFile-MD5: 8729d202e76346cbcbab26917f5b7cf3
+PatchFile-MD5: 7f1bbffe63a1545174ce4bf4d7c7e13a
 PatchScript: <<
  sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
- perl -pi -e 's|/usr/openwin/lib/rgb.txt|/usr/X11/share/X11/rgb.txt|' 
pm_config.in.h
  cat Makefile.config.in Makefile.config.fink >Makefile.config
 <<
 CompileScript: make -j1
@@ -34,7 +33,7 @@
 <<
 SplitOff2: <<
   Package: netpbm-bin
-  Depends: %N-shlibs (= %v-%r), libpng3-shlibs, libtiff-shlibs
+  Depends: %N-shlibs (= %v-%r), libjpeg8-shlibs, libpng3-shlibs, libtiff-shlibs
   Files: bin share/man/man1 share/man/man3
   DocFiles: README doc/*
 <<
@@ -59,4 +58,8 @@
 Maintainer:  Dave Morrison <d...@finkproject.org>
 DescPackaging: <<
  Originally packaged by Masanori Sekino.
+
+ Note: we cannot update the dependency from libpng3 to libpng14 or later
+ until a newer netpbm10 (at least 10.47.04) is declared sufficiently stable
+ to package for fink
 <<


------------------------------------------------------------------------------
Learn Windows Azure Live!  Tuesday, Dec 13, 2011
Microsoft is holding a special Learn Windows Azure training event for 
developers. It will provide a great way to learn Windows Azure and what it 
provides. You can attend the event by watching it streamed LIVE online.  
Learn more at http://p.sf.net/sfu/ms-windowsazure
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to