Make this package build on NetBSD-1.6 and later

15 files changed, 224 insertions, 1 deletions

diff --git a/mbone/vic/distinfo b/mbone/vic/distinfo
index d26bb817d16..d8b45ee2223 100644
--- a/mbone/vic/distinfo
+++ b/mbone/vic/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 14:33:57 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/08/16 16:55:59 agc Exp $
 
 SHA1 (vicsrc-2.8.tar.gz) = ec58bf10aed99301f1e0e0828d0f2f32acdafe1d
 Size (vicsrc-2.8.tar.gz) = 605136 bytes
@@ -11,3 +11,17 @@ 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..04f862dcb3a
--- /dev/null
+++ b/mbone/vic/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2002/08/16 16:56:00 agc Exp $
+
+--- 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..9b0c41b4d23
--- /dev/null
+++ b/mbone/vic/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2002/08/16 16:56:00 agc Exp $
+
+--- 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..d31bbfd74e5
--- /dev/null
+++ b/mbone/vic/patches/patch-am
@@ -0,0 +1,22 @@
+$NetBSD: patch-am,v 1.1 2002/08/16 16:56:00 agc Exp $
+
+--- 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..0b0f4f169bf
--- /dev/null
+++ b/mbone/vic/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2002/08/16 16:56:00 agc Exp $
+
+--- 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..e5f87e5afbd
--- /dev/null
+++ b/mbone/vic/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2002/08/16 16:56:00 agc Exp $
+
+--- 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..81befa711aa
--- /dev/null
+++ b/mbone/vic/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2002/08/16 16:56:00 agc Exp $
+
+--- 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..d06ac0f6033
--- /dev/null
+++ b/mbone/vic/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2002/08/16 16:56:00 agc Exp $
+
+--- 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..be0f1acbfe7
--- /dev/null
+++ b/mbone/vic/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2002/08/16 16:56:00 agc Exp $
+
+--- 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..065e3d9c742
--- /dev/null
+++ b/mbone/vic/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1 2002/08/16 16:56:01 agc Exp $
+
+--- 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..febeeff64b3
--- /dev/null
+++ b/mbone/vic/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.1 2002/08/16 16:56:01 agc Exp $
+
+--- 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..58afbf3183c
--- /dev/null
+++ b/mbone/vic/patches/patch-au
@@ -0,0 +1,13 @@
+$NetBSD: patch-au,v 1.1 2002/08/16 16:56:01 agc Exp $
+
+--- 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..deb842de2e4
--- /dev/null
+++ b/mbone/vic/patches/patch-av
@@ -0,0 +1,22 @@
+$NetBSD: patch-av,v 1.1 2002/08/16 16:56:01 agc Exp $
+
+--- 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..1336dfbdb96
--- /dev/null
+++ b/mbone/vic/patches/patch-aw
@@ -0,0 +1,22 @@
+$NetBSD: patch-aw,v 1.1 2002/08/16 16:56:01 agc Exp $
+
+--- 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..1037ad0d075
--- /dev/null
+++ b/mbone/vic/patches/patch-ax
@@ -0,0 +1,13 @@
+$NetBSD: patch-ax,v 1.1 2002/08/16 16:56:01 agc Exp $
+
+--- 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 <unistd.h>
+ #endif
+ #define HUFFSTRINGS
+ #include "p64-huff.h"