pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/netpbm added support for IRIX 5 and in partic...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f020f90ca367
branches:  trunk
changeset: 519491:f020f90ca367
user:      schwarz <schwarz%pkgsrc.org@localhost>
date:      Tue Oct 03 22:56:50 2006 +0000

description:
added support for IRIX 5 and in particular the SGI IDO cc.
patches were discussed with Bryan Henderson, maintainer of the netpbm
code.

diffstat:

 graphics/netpbm/Makefile         |  12 ++++++++++-
 graphics/netpbm/distinfo         |  19 ++++++++++++++++-
 graphics/netpbm/patches/patch-ac |  20 ++++++++++++++++++
 graphics/netpbm/patches/patch-ag |  14 ++++++++++++
 graphics/netpbm/patches/patch-ai |  13 +++++++++++
 graphics/netpbm/patches/patch-aj |  13 +++++++++++
 graphics/netpbm/patches/patch-ak |  31 ++++++++++++++++++++++++++++
 graphics/netpbm/patches/patch-al |  13 +++++++++++
 graphics/netpbm/patches/patch-am |  22 ++++++++++++++++++++
 graphics/netpbm/patches/patch-an |  31 ++++++++++++++++++++++++++++
 graphics/netpbm/patches/patch-ao |  22 ++++++++++++++++++++
 graphics/netpbm/patches/patch-ap |  13 +++++++++++
 graphics/netpbm/patches/patch-aq |  13 +++++++++++
 graphics/netpbm/patches/patch-ar |  13 +++++++++++
 graphics/netpbm/patches/patch-as |  19 +++++++++++++++++
 graphics/netpbm/patches/patch-at |  13 +++++++++++
 graphics/netpbm/patches/patch-au |  44 ++++++++++++++++++++++++++++++++++++++++
 graphics/netpbm/patches/patch-av |  22 ++++++++++++++++++++
 graphics/netpbm/patches/patch-aw |  13 +++++++++++
 19 files changed, 358 insertions(+), 2 deletions(-)

diffs (truncated from 457 to 300 lines):

diff -r 87fcdabfe546 -r f020f90ca367 graphics/netpbm/Makefile
--- a/graphics/netpbm/Makefile  Tue Oct 03 21:44:24 2006 +0000
+++ b/graphics/netpbm/Makefile  Tue Oct 03 22:56:50 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.144 2006/09/09 02:42:01 obache Exp $
+# $NetBSD: Makefile,v 1.145 2006/10/03 22:56:50 schwarz Exp $
 
 DISTNAME=      netpbm-10.34
 CATEGORIES=    graphics
@@ -57,6 +57,16 @@
 MAKE_ENV+=     JASPERLIB="${LDFLAGS} -ljasper"
 MAKE_ENV+=     JASPERHDR_DIR=${CPPFLAGS:M*:Q}
 
+.if ${PKGSRC_COMPILER} == "ido"
+CPPFLAGS+=     -DSGI_IDO_CC
+.endif
+
+.if !empty(LOWER_OPSYS:Mirix5*)
+# needs snprintf()
+. include "../../pkgtools/libnbcompat/buildlink3.mk"
+LIBS+=         ${BUILDLINK_LDADD.libnbcompat}
+.endif
+
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff -r 87fcdabfe546 -r f020f90ca367 graphics/netpbm/distinfo
--- a/graphics/netpbm/distinfo  Tue Oct 03 21:44:24 2006 +0000
+++ b/graphics/netpbm/distinfo  Tue Oct 03 22:56:50 2006 +0000
@@ -1,12 +1,29 @@
-$NetBSD: distinfo,v 1.59 2006/06/25 06:35:58 adam Exp $
+$NetBSD: distinfo,v 1.60 2006/10/03 22:56:50 schwarz Exp $
 
 SHA1 (netpbm-10.34.tgz) = 530458871f9d3dc763a1bf82f227eeb79098c601
 RMD160 (netpbm-10.34.tgz) = 57a596efa6cacb981135d554a72cbaffc4cfe72c
 Size (netpbm-10.34.tgz) = 2507007 bytes
 SHA1 (patch-aa) = dbb17588aa8f8628ad98af43935adc710f870d0f
 SHA1 (patch-ab) = 7781c51e9a8cc9de953540a04e19303244ef8d57
+SHA1 (patch-ac) = d53f58a8d982c60930855542830170cfd0d24a0a
 SHA1 (patch-ad) = b4a5833e18afd5a991aad897674386a3f00c3ee1
 SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1
 SHA1 (patch-af) = 41c3506dcd267ce15d5b7e5ff9b0c1ee97b54e26
+SHA1 (patch-ag) = 59417c163c0ddc822a887a29e595d38323b87af5
 SHA1 (patch-ah) = f2a542983932edebee2110868e631b394f380b26
+SHA1 (patch-ai) = e9b3a473af2251f1779b3cd33b572002064d548a
+SHA1 (patch-aj) = 5501ffdb7217b111bf4d32b844e2bd3379bed3c9
+SHA1 (patch-ak) = 18f5b387bd54bf9edf14d165c3c68dd8d0b7a5b1
+SHA1 (patch-al) = ef80a678d20a5c19a13e37a24450509134655e2c
+SHA1 (patch-am) = 5dec683fca749cde93f08551188a3ec3c6a4c164
+SHA1 (patch-an) = ad3181141fa96cca50527a53ec517f1eacad9e21
+SHA1 (patch-ao) = e2ef759040a863fd2fe7dccdd3c6e5103b7abd9c
+SHA1 (patch-ap) = 3be9b2bc02b8a4237dc83f9911c710b8812c7e95
+SHA1 (patch-aq) = 2d89416ae882a504193b1b8a67e29c02ad829120
+SHA1 (patch-ar) = 4e78f0002f568cb85a3dc24aab1d642e980d4232
+SHA1 (patch-as) = 3b479e30b5c19ab63045685ec705d600209fa8b4
+SHA1 (patch-at) = 48cbc777fac07c7cfe12c06a9c37b54031b0c32d
+SHA1 (patch-au) = d098d29cd3b62236e3e4a84b1d74de18de85c06f
+SHA1 (patch-av) = 431da9843c12014ae3ef943bd47af63ade3b42a3
+SHA1 (patch-aw) = bd890324e95fa7bb893d9d5cdab9d5a33dcff777
 SHA1 (patch-ca) = b63be9bd38dd182949edf3b892608b72d13c1fa0
diff -r 87fcdabfe546 -r f020f90ca367 graphics/netpbm/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/netpbm/patches/patch-ac  Tue Oct 03 22:56:50 2006 +0000
@@ -0,0 +1,20 @@
+--- lib/ppmdraw.h.orig 2006-09-26 21:01:00.000000000 +0200
++++ lib/ppmdraw.h      2006-09-26 21:13:09.000000000 +0200
+@@ -59,7 +59,7 @@
+ 
+ 
+ 
+-typedef void ppmd_drawproc(pixel **, int, int, pixval, int, int, const void *);
++typedef void ppmd_drawproc(pixel ** const, int const, int const, pixval const, int const, int const, const void *const);
+ 
+ ppmd_drawproc ppmd_point_drawproc;
+ 
+@@ -274,7 +274,7 @@
+           int          const height, 
+           int          const angle, 
+           const char * const sArg, 
+-          void (*drawprocP)(pixel**, int, int, pixval, int, int, const void*), 
++         ppmd_drawproc drawproc,
+     const void*  const clientdata);
+ /* Draws the null-terminated string 's' left justified at the point
+    ('x', 'y').  The text will be 'height' pixels high and will be aligned on a
diff -r 87fcdabfe546 -r f020f90ca367 graphics/netpbm/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/netpbm/patches/patch-ag  Tue Oct 03 22:56:50 2006 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ag,v 1.18 2006/10/03 22:56:50 schwarz Exp $
+
+--- lib/libppmd.c.orig 2006-10-03 17:51:58.000000000 +0200
++++ lib/libppmd.c      2006-10-03 17:53:15.000000000 +0200
+@@ -688,7 +688,9 @@
+ 
+ 
+ 
++#ifndef SGI_IDO_CC
+ static qsort_compare yx_compare;
++#endif
+ 
+ static int
+ yx_compare(const void * const c1Arg,
diff -r 87fcdabfe546 -r f020f90ca367 graphics/netpbm/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/netpbm/patches/patch-ai  Tue Oct 03 22:56:50 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.11 2006/10/03 22:56:50 schwarz Exp $
+
+--- lib/pm.h.orig      2006-09-26 20:49:52.000000000 +0200
++++ lib/pm.h   2006-09-26 19:53:11.000000000 +0200
+@@ -65,7 +65,7 @@
+ #ifdef __GNUC__
+ #define PM_GNU_PRINTF_ATTR(a,b) __attribute__ ((format (printf, a, b)))
+ #else
+-#define PM_GNU_PRINTF_ATTR
++#define PM_GNU_PRINTF_ATTR(a,b)
+ #endif
+ 
+ 
diff -r 87fcdabfe546 -r f020f90ca367 graphics/netpbm/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/netpbm/patches/patch-aj  Tue Oct 03 22:56:50 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.11 2006/10/03 22:56:50 schwarz Exp $
+
+--- converter/ppm/sldtoppm.c.orig      2006-09-26 22:50:39.000000000 +0200
++++ converter/ppm/sldtoppm.c   2006-09-26 22:50:58.000000000 +0200
+@@ -74,7 +74,7 @@
+                     void (*slflood) ARGS((struct spolygon *poly, int color)) ));
+ static void slidefind ARGS((char *sname, int dironly, int ucasen));
+ static void draw ARGS((struct svector *vec, int color));
+-static void flood ARGS((struct spolygon *poly, int color));
++static void flood ARGS((struct spolygon *const poly, int const color));
+ 
+ static int ixdots, iydots;        /* Screen size in dots */
+ static FILE *slfile;              /* Slide file descriptor */
diff -r 87fcdabfe546 -r f020f90ca367 graphics/netpbm/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/netpbm/patches/patch-ak  Tue Oct 03 22:56:50 2006 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-ak,v 1.7 2006/10/03 22:56:51 schwarz Exp $
+
+--- converter/ppm/ppmtompeg/headers/frame.h.orig       2005-12-24 04:23:55.000000000 +0100
++++ converter/ppm/ppmtompeg/headers/frame.h    2006-09-27 00:02:16.000000000 +0200
+@@ -131,17 +131,17 @@
+              int         const outsize_y);
+ 
+ 
+-extern void     Frame_Free _ANSI_ARGS_((MpegFrame *frame));
++extern void     Frame_Free _ANSI_ARGS_((MpegFrame * const frame));
+ extern void     Frame_Exit _ANSI_ARGS_((void));
+ extern void     Frame_AllocPPM _ANSI_ARGS_((MpegFrame * frame));
+-extern void     Frame_AllocYCC _ANSI_ARGS_((MpegFrame * mf));
+-extern void     Frame_AllocDecoded _ANSI_ARGS_((MpegFrame *frame,
+-                                                boolean makeReference));
+-extern void     Frame_AllocHalf _ANSI_ARGS_((MpegFrame *frame));
+-extern void     Frame_AllocBlocks _ANSI_ARGS_((MpegFrame *mf));
+-extern void     Frame_Resize _ANSI_ARGS_((MpegFrame *omf, MpegFrame *mf,
+-                                          int insize_x, int insize_y,
+-                                          int outsize_x, int outsize_y));
++extern void     Frame_AllocYCC _ANSI_ARGS_((MpegFrame * const mf));
++extern void     Frame_AllocDecoded _ANSI_ARGS_((MpegFrame * const frame,
++                                                boolean const makeReference));
++extern void     Frame_AllocHalf _ANSI_ARGS_((MpegFrame * const frame));
++extern void     Frame_AllocBlocks _ANSI_ARGS_((MpegFrame * const mf));
++extern void     Frame_Resize _ANSI_ARGS_((MpegFrame * const omf, MpegFrame * const mf,
++                                          int const insize_x, int const insize_y,
++                                          int const outsize_x, int const outsize_y));
+ 
+ 
+ #endif /* FRAME_INCLUDED */
diff -r 87fcdabfe546 -r f020f90ca367 graphics/netpbm/patches/patch-al
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/netpbm/patches/patch-al  Tue Oct 03 22:56:50 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.3 2006/10/03 22:56:51 schwarz Exp $
+
+--- ./converter/ppm/ppmtompeg/mheaders.c.orig  2006-09-30 16:44:28.000000000 +0200
++++ ./converter/ppm/ppmtompeg/mheaders.c       2006-09-30 16:45:11.000000000 +0200
+@@ -293,7 +293,7 @@
+ static void   GenMBType _ANSI_ARGS_((BitBucket *bb, uint32 pict_code_type,
+                 uint32 mb_quant, uint32 motion_forw, uint32 motion_back,
+                 uint32 mb_pattern, uint32 mb_intra));
+-static void   GenMotionCode _ANSI_ARGS_((BitBucket *bb, int32 vector));
++static void   GenMotionCode _ANSI_ARGS_((BitBucket * const bb, int32 const vector));
+ static void   GenBlockPattern _ANSI_ARGS_((BitBucket *bb,
+                                            uint32 mb_pattern));
+ 
diff -r 87fcdabfe546 -r f020f90ca367 graphics/netpbm/patches/patch-am
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/netpbm/patches/patch-am  Tue Oct 03 22:56:50 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-am,v 1.3 2006/10/03 22:56:51 schwarz Exp $
+
+--- converter/ppm/ppmtompeg/iframe.c.orig      2006-09-30 16:49:39.000000000 +0200
++++ converter/ppm/ppmtompeg/iframe.c   2006-09-30 16:58:18.000000000 +0200
+@@ -136,14 +136,14 @@
+ /*=====================*
+  * EXPORTED PROCEDURES *
+  *=====================*/
+-extern void PrintItoIBitRate _ANSI_ARGS_((int numBits, int frameNum));
++extern void PrintItoIBitRate _ANSI_ARGS_((int const numBits, int const frameNum));
+ 
+ /*===============================*
+  * INTERNAL PROCEDURE prototypes *
+  *===============================*/
+ void AllocDctBlocks(void );
+-int SetFCodeHelper (int sr);
+-void CalcDistortion (MpegFrame *current, int y, int x);
++int SetFCodeHelper (int const sr);
++void CalcDistortion (MpegFrame * const current, int const y, int const x);
+ 
+ int
+ SetFCodeHelper(int const SR) {
diff -r 87fcdabfe546 -r f020f90ca367 graphics/netpbm/patches/patch-an
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/netpbm/patches/patch-an  Tue Oct 03 22:56:50 2006 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-an,v 1.3 2006/10/03 22:56:51 schwarz Exp $
+
+--- converter/ppm/ppmtompeg/headers/prototypes.h.orig  2006-09-30 16:51:04.000000000 +0200
++++ converter/ppm/ppmtompeg/headers/prototypes.h       2006-09-30 17:01:04.000000000 +0200
+@@ -47,7 +47,7 @@
+ void    ResetIFrameStats _ANSI_ARGS_((void));
+ void
+ SetPixelSearch(const char * const searchType);
+-void    SetIQScale _ANSI_ARGS_((int qI));
++void    SetIQScale _ANSI_ARGS_((int const qI));
+ void    SetPQScale _ANSI_ARGS_((int qP));
+ void    SetBQScale _ANSI_ARGS_((int qB));
+ float   EstimateSecondsPerIFrame _ANSI_ARGS_((void));
+@@ -56,7 +56,7 @@
+ void    SetGOPSize _ANSI_ARGS_((int size));
+ void
+ SetStatFileName(const char * const fileName);
+-void    SetSlicesPerFrame _ANSI_ARGS_((int number));
++void    SetSlicesPerFrame _ANSI_ARGS_((int const number));
+ void    SetBlocksPerSlice _ANSI_ARGS_((void));
+ 
+ 
+@@ -64,7 +64,7 @@
+ 
+ void PPMtoYCC _ANSI_ARGS_((MpegFrame * mf));
+ 
+-void    MotionSearchPreComputation _ANSI_ARGS_((MpegFrame *frame));
++void    MotionSearchPreComputation _ANSI_ARGS_((MpegFrame * const frame));
+ 
+ void    ComputeHalfPixelData _ANSI_ARGS_((MpegFrame *frame));
+ void mp_validate_size _ANSI_ARGS_((int *x, int *y));
diff -r 87fcdabfe546 -r f020f90ca367 graphics/netpbm/patches/patch-ao
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/netpbm/patches/patch-ao  Tue Oct 03 22:56:50 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ao,v 1.3 2006/10/03 22:56:51 schwarz Exp $
+
+--- converter/ppm/ppmtompeg/headers/frames.h.orig      2006-10-03 17:41:32.000000000 +0200
++++ converter/ppm/ppmtompeg/headers/frames.h   2006-10-03 17:45:50.000000000 +0200
+@@ -8,6 +8,8 @@
+ #ifndef FRAMES_INCLUDED
+ #define FRAMES_INCLUDED
+ 
++#include "pm_config.h"
++
+ /*==============*
+  * HEADER FILES *
+  *==============*/
+@@ -85,7 +87,7 @@
+   int fmotionX, fmotionY, bmotionX, bmotionY;
+ } dct_data_type;
+ 
+-void    EncodeYDC _ANSI_ARGS_((int32 dc_term, int32 *pred_term, BitBucket *bb));
++void    EncodeYDC _ANSI_ARGS_((int32 const dc_term, int32 * const pred_term, BitBucket * const bb));
+ void
+ EncodeCDC(int32       const dc_term,
+           int32     * const pred_term,
diff -r 87fcdabfe546 -r f020f90ca367 graphics/netpbm/patches/patch-ap
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/netpbm/patches/patch-ap  Tue Oct 03 22:56:50 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.3 2006/10/03 22:56:51 schwarz Exp $
+
+--- converter/ppm/ppmtompeg/headers/mpeg.h.orig        2006-09-30 16:55:59.000000000 +0200
++++ converter/ppm/ppmtompeg/headers/mpeg.h     2006-09-30 16:56:18.000000000 +0200
+@@ -90,7 +90,7 @@
+ ReadDecodedRefFrame(MpegFrame *  const frameP, 
+                     unsigned int const frameNumber);
+ 
+-extern void   WriteDecodedFrame _ANSI_ARGS_((MpegFrame *frame));
++extern void   WriteDecodedFrame _ANSI_ARGS_((MpegFrame * const frame));
+ extern void   SetBitRateFileName _ANSI_ARGS_((char *fileName));
+ extern void   SetFrameRate _ANSI_ARGS_((void));
+ 
diff -r 87fcdabfe546 -r f020f90ca367 graphics/netpbm/patches/patch-aq
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/netpbm/patches/patch-aq  Tue Oct 03 22:56:50 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.3 2006/10/03 22:56:51 schwarz Exp $
+
+--- converter/ppm/ppmtompeg/headers/parallel.h.orig    2006-09-30 17:03:27.000000000 +0200
++++ converter/ppm/ppmtompeg/headers/parallel.h 2006-09-30 17:03:43.000000000 +0200



Home | Main Index | Thread Index | Old Index