From b7237638510b217b0c2eb9f6ab9d5f187860bac7 Mon Sep 17 00:00:00 2001 From: branch-fixup Date: Fri, 16 Aug 2002 16:56:01 +0000 Subject: [PATCH] Add files from parent branch HEAD: mbone/vic/distinfo mbone/vic/patches/patch-ak mbone/vic/patches/patch-al mbone/vic/patches/patch-am mbone/vic/patches/patch-an mbone/vic/patches/patch-ao mbone/vic/patches/patch-ap mbone/vic/patches/patch-aq mbone/vic/patches/patch-ar mbone/vic/patches/patch-as mbone/vic/patches/patch-at mbone/vic/patches/patch-au mbone/vic/patches/patch-av mbone/vic/patches/patch-aw mbone/vic/patches/patch-ax --- mbone/vic/distinfo | 27 +++++++++++++++++++++++++++ mbone/vic/patches/patch-ak | 13 +++++++++++++ mbone/vic/patches/patch-al | 13 +++++++++++++ mbone/vic/patches/patch-am | 22 ++++++++++++++++++++++ mbone/vic/patches/patch-an | 13 +++++++++++++ mbone/vic/patches/patch-ao | 13 +++++++++++++ mbone/vic/patches/patch-ap | 13 +++++++++++++ mbone/vic/patches/patch-aq | 13 +++++++++++++ mbone/vic/patches/patch-ar | 13 +++++++++++++ mbone/vic/patches/patch-as | 13 +++++++++++++ mbone/vic/patches/patch-at | 13 +++++++++++++ mbone/vic/patches/patch-au | 13 +++++++++++++ mbone/vic/patches/patch-av | 22 ++++++++++++++++++++++ mbone/vic/patches/patch-aw | 22 ++++++++++++++++++++++ mbone/vic/patches/patch-ax | 13 +++++++++++++ 15 files changed, 236 insertions(+) create mode 100644 mbone/vic/distinfo create mode 100644 mbone/vic/patches/patch-ak create mode 100644 mbone/vic/patches/patch-al create mode 100644 mbone/vic/patches/patch-am create mode 100644 mbone/vic/patches/patch-an create mode 100644 mbone/vic/patches/patch-ao create mode 100644 mbone/vic/patches/patch-ap create mode 100644 mbone/vic/patches/patch-aq create mode 100644 mbone/vic/patches/patch-ar create mode 100644 mbone/vic/patches/patch-as create mode 100644 mbone/vic/patches/patch-at create mode 100644 mbone/vic/patches/patch-au create mode 100644 mbone/vic/patches/patch-av create mode 100644 mbone/vic/patches/patch-aw create mode 100644 mbone/vic/patches/patch-ax diff --git a/mbone/vic/distinfo b/mbone/vic/distinfo new file mode 100644 index 00000000000..40e15b4af4a --- /dev/null +++ b/mbone/vic/distinfo @@ -0,0 +1,27 @@ +$NetBSD: distinfo,v 1.2 2001/04/18 14:33:57 agc Exp $ + +SHA1 (vicsrc-2.8.tar.gz) = ec58bf10aed99301f1e0e0828d0f2f32acdafe1d +Size (vicsrc-2.8.tar.gz) = 605136 bytes +SHA1 (patch-ab) = 8a9f5fbacc8e90b62cbb4dc7335fab2c23512ef4 +SHA1 (patch-ac) = e95936892d83876c90edb5e81963350c60e56866 +SHA1 (patch-ad) = ae4b9b349017a163d3c7632c10e6aa62433a3ede +SHA1 (patch-ae) = 05b45b8ac88a0c86d39b53cc1f2c4499411745da +SHA1 (patch-af) = 5263cff868b12a54b51760b605fdc91180554371 +SHA1 (patch-ag) = d3458b0a01cea09b55795574c54cd8b6007e75a6 +SHA1 (patch-ah) = b5ed0c03955ee1f60c18ea71a142a365947a4962 +SHA1 (patch-ai) = 2d651ec7bb05115ae655239716bde8856bab7ff2 +SHA1 (patch-aj) = 148d183345c159e4f02a0ea10648406eb733545a +SHA1 (patch-ak) = 764766b60d93e3525bea01b65a43b6b9092e55d1 +SHA1 (patch-al) = ae870102e3badc8705ff517189b24766f5e13737 +SHA1 (patch-am) = b9a9e31d58eaddd57394dd7b4546f3668076333c +SHA1 (patch-an) = 2f9e09c6da4d7800df43d0bb885ab293fa61e0b1 +SHA1 (patch-ao) = fd7409267aaaaa2d64f036b92c963a0fc85675df +SHA1 (patch-ap) = 6207c15b3f0385e7b2a9c3e97d7261cd5fcf4e85 +SHA1 (patch-aq) = 728c909b65818b99bcef6839868ee6ed420a1757 +SHA1 (patch-ar) = f5e9ebe593adab166708e83c984eddbc0efea3a1 +SHA1 (patch-as) = bb851e2627dbf0a336d3e71dad0440043d7bba06 +SHA1 (patch-at) = 4ebd0d44b088578e658d15351aa76bbdfb3f4a3a +SHA1 (patch-au) = 55e52deefff784da3e0a10d44405196e66e70d9d +SHA1 (patch-av) = 683ad2d688fce18757eae090a3d52249897cb922 +SHA1 (patch-aw) = 735e7cda5f1cabe312decdcf992258ac8a895f63 +SHA1 (patch-ax) = 9f7ab611dc426a4f317b46803dbca218be903b10 diff --git a/mbone/vic/patches/patch-ak b/mbone/vic/patches/patch-ak new file mode 100644 index 00000000000..34da26b02ca --- /dev/null +++ b/mbone/vic/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD$ + +--- net.cc 2002/08/16 16:25:42 1.1 ++++ net.cc 2002/08/16 16:26:19 +@@ -297,7 +297,7 @@ + int Network::dorecv(u_char* buf, int len, u_int32_t& from, int fd) + { + sockaddr_in sfrom; +- int fromlen = sizeof(sfrom); ++ socklen_t fromlen = sizeof(sfrom); + int cc = ::recvfrom(fd, (char*)buf, len, 0, + (sockaddr*)&sfrom, &fromlen); + if (cc < 0) { diff --git a/mbone/vic/patches/patch-al b/mbone/vic/patches/patch-al new file mode 100644 index 00000000000..7c315730bdf --- /dev/null +++ b/mbone/vic/patches/patch-al @@ -0,0 +1,13 @@ +$NetBSD$ + +--- net-ip.cc 2002/08/16 16:27:09 1.1 ++++ net-ip.cc 2002/08/16 16:27:23 +@@ -203,7 +203,7 @@ + { + memset((char *)p, 0, sizeof(*p)); + p->sin_family = AF_INET; +- int len = sizeof(*p); ++ socklen_t len = sizeof(*p); + if (getsockname(ssock_, (struct sockaddr *)p, &len) < 0) { + perror("getsockname"); + p->sin_addr.s_addr = 0; diff --git a/mbone/vic/patches/patch-am b/mbone/vic/patches/patch-am new file mode 100644 index 00000000000..56a41b4bc4c --- /dev/null +++ b/mbone/vic/patches/patch-am @@ -0,0 +1,22 @@ +$NetBSD$ + +--- iohandler.cc 2002/08/16 16:29:18 1.1 ++++ iohandler.cc 2002/08/16 16:29:35 +@@ -132,7 +132,7 @@ + + } + #else +- Tk_CreateFileHandler((ClientData)fd, mask, callback, (ClientData)this); ++ Tk_CreateFileHandler(fd, mask, callback, (ClientData)this); + #endif + } + +@@ -151,7 +151,7 @@ + } + #else + if (fd_ >= 0) { +- Tk_DeleteFileHandler((ClientData)fd_); ++ Tk_DeleteFileHandler(fd_); + fd_ = -1; + } + #endif diff --git a/mbone/vic/patches/patch-an b/mbone/vic/patches/patch-an new file mode 100644 index 00000000000..49b2f71751f --- /dev/null +++ b/mbone/vic/patches/patch-an @@ -0,0 +1,13 @@ +$NetBSD$ + +--- encoder-h261.cc 2002/08/16 16:31:01 1.1 ++++ encoder-h261.cc 2002/08/16 16:31:14 +@@ -631,7 +631,7 @@ + if (q < 8) { + register int cmin = 0, cmax = 0; + register short* bp = lblk; +- register i, j; ++ register int i, j; + + // Y U and V blocks + for (i = 6; --i >= 0; ) { diff --git a/mbone/vic/patches/patch-ao b/mbone/vic/patches/patch-ao new file mode 100644 index 00000000000..bc351cc0724 --- /dev/null +++ b/mbone/vic/patches/patch-ao @@ -0,0 +1,13 @@ +$NetBSD$ + +--- transcoder-jpeg.cc 2002/08/16 16:32:17 1.1 ++++ transcoder-jpeg.cc 2002/08/16 16:32:26 +@@ -138,7 +138,7 @@ + rval = target_->consume(df); + + // update CR vec +- register blkno; ++ register int blkno; + int s; + for (blkno = 0; blkno < crvlen_; blkno++) { + s = CR_STATE(crvec_[blkno]); diff --git a/mbone/vic/patches/patch-ap b/mbone/vic/patches/patch-ap new file mode 100644 index 00000000000..02d6dbc1c08 --- /dev/null +++ b/mbone/vic/patches/patch-ap @@ -0,0 +1,13 @@ +$NetBSD$ + +--- color-true.cc 2002/08/16 16:33:46 1.1 ++++ color-true.cc 2002/08/16 16:34:45 +@@ -180,7 +180,7 @@ + protected: + TrueColorModel& cm_; + virtual void update(); +- virtual void disable() { method_ = TrueMethod(WindowRenderer::dither_null); } ++ virtual void disable() { method_ = TrueMethod(&WindowRenderer::dither_null); } + TrueMethod method_; + void map_422(const u_char* frm, u_int off, u_int x, + u_int width, u_int height) const; diff --git a/mbone/vic/patches/patch-aq b/mbone/vic/patches/patch-aq new file mode 100644 index 00000000000..b052b05a09b --- /dev/null +++ b/mbone/vic/patches/patch-aq @@ -0,0 +1,13 @@ +$NetBSD$ + +--- color-dither.cc 2002/08/16 16:36:06 1.1 ++++ color-dither.cc 2002/08/16 16:37:56 +@@ -177,7 +177,7 @@ + protected: + DitherColorModel& cm_; + virtual void update(); +- virtual void disable() { method_ = PseudoWindowRenderer::dither_null; } ++ virtual void disable() { method_ = &PseudoWindowRenderer::dither_null; } + DitherMethod method_; + void dither_422(const u_char* frm, u_int off, u_int x, + u_int width, u_int height) const; diff --git a/mbone/vic/patches/patch-ar b/mbone/vic/patches/patch-ar new file mode 100644 index 00000000000..b95e55db5d8 --- /dev/null +++ b/mbone/vic/patches/patch-ar @@ -0,0 +1,13 @@ +$NetBSD$ + +--- color-ed.cc 2002/08/16 16:39:06 1.1 ++++ color-ed.cc 2002/08/16 16:39:16 +@@ -180,7 +180,7 @@ + protected: + EDColorModel& cm_; + virtual void update(); +- virtual void disable() { method_ = PseudoWindowRenderer::dither_null; } ++ virtual void disable() { method_ = &PseudoWindowRenderer::dither_null; } + EDMethod method_; + void dither_422(const u_char* frm, u_int off, u_int x, + u_int width, u_int height) const; diff --git a/mbone/vic/patches/patch-as b/mbone/vic/patches/patch-as new file mode 100644 index 00000000000..9ba61d2c03c --- /dev/null +++ b/mbone/vic/patches/patch-as @@ -0,0 +1,13 @@ +$NetBSD$ + +--- color-quant.cc 2002/08/16 16:40:25 1.1 ++++ color-quant.cc 2002/08/16 16:40:50 +@@ -92,7 +92,7 @@ + protected: + QuantColorModel& cm_; + virtual void update(); +- virtual void disable() { method_ = PseudoWindowRenderer::dither_null; } ++ virtual void disable() { method_ = &PseudoWindowRenderer::dither_null; } + QuantMethod method_; + void map_422(const u_char* frm, u_int off, u_int x, + u_int width, u_int height) const; diff --git a/mbone/vic/patches/patch-at b/mbone/vic/patches/patch-at new file mode 100644 index 00000000000..f41e968f793 --- /dev/null +++ b/mbone/vic/patches/patch-at @@ -0,0 +1,13 @@ +$NetBSD$ + +--- color-hi.cc 2002/08/16 16:42:11 1.1 ++++ color-hi.cc 2002/08/16 16:42:28 +@@ -164,7 +164,7 @@ + protected: + HiColorModel& cm_; + virtual void update(); +- virtual void disable() { method_ = HiMethod(WindowRenderer::dither_null); } ++ virtual void disable() { method_ = HiMethod(&WindowRenderer::dither_null); } + HiMethod method_; + void map_422(const u_char* frm, u_int off, u_int x, + u_int width, u_int height) const; diff --git a/mbone/vic/patches/patch-au b/mbone/vic/patches/patch-au new file mode 100644 index 00000000000..d6e2fca2862 --- /dev/null +++ b/mbone/vic/patches/patch-au @@ -0,0 +1,13 @@ +$NetBSD$ + +--- color-gray.cc 2002/08/16 16:44:59 1.1 ++++ color-gray.cc 2002/08/16 16:45:10 +@@ -82,7 +82,7 @@ + } + protected: + virtual void update(); +- virtual void disable() { method_ = PseudoWindowRenderer::dither_null; } ++ virtual void disable() { method_ = &PseudoWindowRenderer::dither_null; } + GrayMethod method_; + }; + diff --git a/mbone/vic/patches/patch-av b/mbone/vic/patches/patch-av new file mode 100644 index 00000000000..01a3656efe0 --- /dev/null +++ b/mbone/vic/patches/patch-av @@ -0,0 +1,22 @@ +$NetBSD$ + +--- color-mono.cc 2002/08/16 16:49:05 1.1 ++++ color-mono.cc 2002/08/16 16:49:31 +@@ -200,7 +200,7 @@ + ~MonoColorModel(); + virtual int alloc_grays(); + virtual int command(int argc, const char*const* argv); +- inline white(void) { return (white_); } ++ inline int white(void) { return (white_); } + private: + int white_; + }; +@@ -250,7 +250,7 @@ + protected: + MonoColorModel& cm_; + virtual void update(); +- virtual void disable() { method_ = WindowDitherer::dither_null; } ++ virtual void disable() { method_ = &WindowDitherer::dither_null; } + MonoMethod method_; + void dither(const u_char* frm, u_int off, u_int x, + u_int width, u_int height) const; diff --git a/mbone/vic/patches/patch-aw b/mbone/vic/patches/patch-aw new file mode 100644 index 00000000000..fb9e8ca02e4 --- /dev/null +++ b/mbone/vic/patches/patch-aw @@ -0,0 +1,22 @@ +$NetBSD$ + +--- jpeg/jpeg.cc 2002/08/16 16:50:42 1.1 ++++ jpeg/jpeg.cc 2002/08/16 16:51:02 +@@ -139,7 +139,7 @@ + dct_unbias_ = 1; + + short *sp = (short *)frm_; +- for (register i = 0; i < n / (BMB * 64) ; i++) { ++ for (register int i = 0; i < n / (BMB * 64) ; i++) { + *sp = DCT_GRAY; + sp += 64; + *sp = DCT_GRAY; +@@ -173,7 +173,7 @@ + dct_unbias_ = 1; + + short *sp = (short*)frm_; +- for (register i = 0; i < n / (BMB * 64) ; i++) { ++ for (register int i = 0; i < n / (BMB * 64) ; i++) { + *sp = DCT_GRAY; + sp += 64; + *sp = DCT_GRAY; diff --git a/mbone/vic/patches/patch-ax b/mbone/vic/patches/patch-ax new file mode 100644 index 00000000000..435e8da6939 --- /dev/null +++ b/mbone/vic/patches/patch-ax @@ -0,0 +1,13 @@ +$NetBSD$ + +--- p64/mkhuff.cc 2002/08/16 16:52:55 1.1 ++++ p64/mkhuff.cc 2002/08/16 16:53:28 +@@ -45,6 +45,8 @@ + extern "C" { + int getopt(int, char * const *, const char *); + } ++#else ++#include + #endif + #define HUFFSTRINGS + #include "p64-huff.h" -- 2.41.0