Add DragonFly support. Fix compilation with GCC 3.4+:

When method_ is not set, assume it means the default dither algorithm,
set it to NULL in disable(). This can also avoid possible segfaults.
Bump revision.

8 files changed, 124 insertions, 39 deletions

diff --git a/mbone/vic/patches/patch-af b/mbone/vic/patches/patch-af
index a5d4f534782..ff4a73d235e 100644
--- a/mbone/vic/patches/patch-af
+++ b/mbone/vic/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 11:10:07 agc Exp $
+$NetBSD: patch-af,v 1.3 2006/02/27 15:49:56 joerg Exp $
 
 --- /usr/local/pkgsrc//mbone/vic/work/vic-2.8/config.h	Thu May 16 14:27:06 1996
 +++ config.h	Wed Nov 19 15:46:41 1997
@@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.2 1998/08/07 11:10:07 agc Exp $
  #define vic_config_h
  
 -#if defined(sgi) || defined(__bsdi__) || defined(__FreeBSD__)
-+#if defined(sgi) || defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(sgi) || defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  #include <sys/types.h>
  #elif defined(linux)
  #include <sys/bitypes.h>
@@ -16,7 +16,7 @@ $NetBSD: patch-af,v 1.2 1998/08/07 11:10:07 agc Exp $
  int strcasecmp(const char *, const char *);
  clock_t clock(void);
 -#if !defined(sco) && !defined(sgi) && !defined(__bsdi__) && !defined(__FreeBSD__)
-+#if !defined(sco) && !defined(sgi) && !defined(__bsdi__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if !defined(sco) && !defined(sgi) && !defined(__bsdi__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
  int gethostid(void);
  #endif
  time_t time(time_t *);
diff --git a/mbone/vic/patches/patch-ap b/mbone/vic/patches/patch-ap
index 81befa711aa..13bc2573992 100644
--- a/mbone/vic/patches/patch-ap
+++ b/mbone/vic/patches/patch-ap
@@ -1,13 +1,25 @@
-$NetBSD: patch-ap,v 1.1 2002/08/16 16:56:00 agc Exp $
+$NetBSD: patch-ap,v 1.2 2006/02/27 15:49:56 joerg 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 @@
+--- color-true.cc.orig	1996-03-04 11:32:13.000000000 +0000
++++ color-true.cc
+@@ -173,14 +173,17 @@ typedef void (TrueWindowRenderer::*TrueM
+ class TrueWindowRenderer : public WindowDitherer {
+ public:
+ 	TrueWindowRenderer(VideoWindow* vw, int decimation, TrueColorModel& cm)
+-		: WindowDitherer(vw, decimation), cm_(cm), method_(0){ }
++		: WindowDitherer(vw, decimation), cm_(cm), method_(NULL){ }
+ 	void render(const u_char* frm, int off, int x, int w, int h) {
+-		(this->*method_)(frm, off, x, w, h);
++		if (this->method_)
++			(this->*method_)(frm, off, x, w, h);
++		else
++			dither_null(frm, off, x, w, h);
+ 	}
  protected:
  	TrueColorModel& cm_;
  	virtual void update();
 -	virtual void disable() { method_ = TrueMethod(WindowRenderer::dither_null); }
-+	virtual void disable() { method_ = TrueMethod(&WindowRenderer::dither_null); }
++	virtual void disable() { method_ = 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
index d06ac0f6033..e9d9b4a1899 100644
--- a/mbone/vic/patches/patch-aq
+++ b/mbone/vic/patches/patch-aq
@@ -1,13 +1,26 @@
-$NetBSD: patch-aq,v 1.1 2002/08/16 16:56:00 agc Exp $
+$NetBSD: patch-aq,v 1.2 2006/02/27 15:49:56 joerg 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 @@
+--- color-dither.cc.orig	1995-11-14 05:46:09.000000000 +0000
++++ color-dither.cc
+@@ -169,15 +169,19 @@ class DitherWindowRenderer : public Pseu
+ public:
+ 	DitherWindowRenderer(VideoWindow* vw, int decimation,
+ 			     DitherColorModel& cm) :
++		method_(NULL),
+ 		PseudoWindowRenderer(vw, decimation, cm.graylut()),
+ 		cm_(cm) { }
+ 	void render(const u_char* frm, int off, int x, int w, int h) {
+-		(this->*method_)(frm, off, x, w, h);
++		if (this->method_)
++			(this->*method_)(frm, off, x, w, h);
++		else
++			dither_null(frm, off, x, w, h);
+ 	}
  protected:
  	DitherColorModel& cm_;
  	virtual void update();
 -	virtual void disable() { method_ = PseudoWindowRenderer::dither_null; }
-+	virtual void disable() { method_ = &PseudoWindowRenderer::dither_null; }
++	virtual void disable() { method_ = 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
index be0f1acbfe7..41a127f09c2 100644
--- a/mbone/vic/patches/patch-ar
+++ b/mbone/vic/patches/patch-ar
@@ -1,13 +1,25 @@
-$NetBSD: patch-ar,v 1.1 2002/08/16 16:56:00 agc Exp $
+$NetBSD: patch-ar,v 1.2 2006/02/27 15:49:56 joerg 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 @@
+--- color-ed.cc.orig	1995-11-14 05:46:10.000000000 +0000
++++ color-ed.cc
+@@ -173,14 +173,17 @@ class EDWindowRenderer : public PseudoWi
+ public:
+ 	EDWindowRenderer(VideoWindow* vw, int decimation, EDColorModel& cm) :
+ 		PseudoWindowRenderer(vw, decimation, cm.graylut()),
+-		cm_(cm) { }
++		cm_(cm), method_(NULL) { }
+ 	void render(const u_char* frm, int off, int x, int w, int h) {
+-		(this->*method_)(frm, off, x, w, h);
++		if (this->method_)
++			(this->*method_)(frm, off, x, w, h);
++		else
++			dither_null(frm, off, x, w, h);
+ 	}
  protected:
  	EDColorModel& cm_;
  	virtual void update();
 -	virtual void disable() { method_ = PseudoWindowRenderer::dither_null; }
-+	virtual void disable() { method_ = &PseudoWindowRenderer::dither_null; }
++	virtual void disable() { method_ = 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
index 065e3d9c742..4b0cd4d9f81 100644
--- a/mbone/vic/patches/patch-as
+++ b/mbone/vic/patches/patch-as
@@ -1,13 +1,25 @@
-$NetBSD: patch-as,v 1.1 2002/08/16 16:56:01 agc Exp $
+$NetBSD: patch-as,v 1.2 2006/02/27 15:49:56 joerg 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 @@
+--- color-quant.cc.orig	1996-02-16 03:21:16.000000000 +0000
++++ color-quant.cc
+@@ -85,14 +85,17 @@ class QuantWindowRenderer : public Pseud
+ public:
+ 	QuantWindowRenderer(VideoWindow* vw, int decimation, QuantColorModel& cm) :
+ 		PseudoWindowRenderer(vw, decimation, cm.graylut()),
+-		cm_(cm) { }
++		cm_(cm), method_(NULL) { }
+ 	void render(const u_char* frm, int off, int x, int w, int h) {
+-		(this->*method_)(frm, off, x, w, h);
++		if (this->method_)
++			(this->*method_)(frm, off, x, w, h);
++		else
++			dither_null(frm, off, x, w, h);
+ 	}
  protected:
  	QuantColorModel& cm_;
  	virtual void update();
 -	virtual void disable() { method_ = PseudoWindowRenderer::dither_null; }
-+	virtual void disable() { method_ = &PseudoWindowRenderer::dither_null; }
++	virtual void disable() { method_ = 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
index febeeff64b3..121242953b9 100644
--- a/mbone/vic/patches/patch-at
+++ b/mbone/vic/patches/patch-at
@@ -1,13 +1,25 @@
-$NetBSD: patch-at,v 1.1 2002/08/16 16:56:01 agc Exp $
+$NetBSD: patch-at,v 1.2 2006/02/27 15:49:56 joerg 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 @@
+--- color-hi.cc.orig	1996-05-16 12:42:44.000000000 +0000
++++ color-hi.cc
+@@ -157,14 +157,17 @@ typedef void (HiWindowRenderer::*HiMetho
+ class HiWindowRenderer : public WindowDitherer {
+     public:
+ 	HiWindowRenderer(VideoWindow* vw, int decimation, HiColorModel& cm)
+-		: WindowDitherer(vw, decimation), cm_(cm), method_(0){ }
++		: WindowDitherer(vw, decimation), cm_(cm), method_(NULL){ }
+ 	void render(const u_char* frm, int off, int x, int w, int h) {
+-		(this->*method_)(frm, off, x, w, h);
++		if (this->method_)
++			(this->*method_)(frm, off, x, w, h);
++		else
++			dither_null(frm, off, x, w, h);
+ 	}
      protected:
  	HiColorModel& cm_;
  	virtual void update();
 -	virtual void disable() { method_ = HiMethod(WindowRenderer::dither_null); }
-+	virtual void disable() { method_ = HiMethod(&WindowRenderer::dither_null); }
++	virtual void disable() { method_ = 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
index 58afbf3183c..5fd0610c69a 100644
--- a/mbone/vic/patches/patch-au
+++ b/mbone/vic/patches/patch-au
@@ -1,13 +1,25 @@
-$NetBSD: patch-au,v 1.1 2002/08/16 16:56:01 agc Exp $
+$NetBSD: patch-au,v 1.2 2006/02/27 15:49:56 joerg 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 @@
+--- color-gray.cc.orig	1995-11-14 05:46:10.000000000 +0000
++++ color-gray.cc
+@@ -75,14 +75,17 @@ typedef void (GrayWindowRenderer::*GrayM
+ class GrayWindowRenderer : public PseudoWindowRenderer {
+ public:
+ 	GrayWindowRenderer(VideoWindow* vw, int decimation,
+-			   const u_short* graylut) :
++			   const u_short* graylut) : method_(NULL),
+ 		PseudoWindowRenderer(vw, decimation, graylut) { }
+ 	void render(const u_char* frm, int off, int x, int w, int h) {
+-		(this->*method_)(frm, off, x, w, h);
++		if (this->method_)
++			(this->*method_)(frm, off, x, w, h);
++		else
++			dither_null(frm, off, x, w, h);
  	}
  protected:
  	virtual void update();
 -	virtual void disable() { method_ = PseudoWindowRenderer::dither_null; }
-+	virtual void disable() { method_ = &PseudoWindowRenderer::dither_null; }
++	virtual void disable() { method_ = NULL; }
  	GrayMethod method_;
  };
  
diff --git a/mbone/vic/patches/patch-av b/mbone/vic/patches/patch-av
index deb842de2e4..b21f10651b9 100644
--- a/mbone/vic/patches/patch-av
+++ b/mbone/vic/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.1 2002/08/16 16:56:01 agc Exp $
+$NetBSD: patch-av,v 1.2 2006/02/27 15:49:56 joerg 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 @@
+--- color-mono.cc.orig	1995-11-14 02:14:31.000000000 +0000
++++ color-mono.cc
+@@ -200,7 +200,7 @@ public:
  	~MonoColorModel();
  	virtual int alloc_grays();
  	virtual int command(int argc, const char*const* argv);
@@ -11,12 +11,24 @@ $NetBSD: patch-av,v 1.1 2002/08/16 16:56:01 agc Exp $
  private:
  	int white_;
  };
-@@ -250,7 +250,7 @@
+@@ -243,14 +243,17 @@ typedef void (MonoWindowRenderer::*MonoM
+ class MonoWindowRenderer : public WindowDitherer {
+ public:
+ 	MonoWindowRenderer(VideoWindow* vw, int decimation, MonoColorModel& cm) :
+-		WindowDitherer(vw, decimation), cm_(cm) { }
++		WindowDitherer(vw, decimation), cm_(cm), method_(NULL) { }
+ 	void render(const u_char* frm, int off, int x, int w, int h) {
+-		(this->*method_)(frm, off, x, w, h);
++		if (this->method_)
++			(this->*method_)(frm, off, x, w, h);
++		else
++			dither_null(frm, off, x, w, h);
+ 	}
  protected:
  	MonoColorModel& cm_;
  	virtual void update();
 -	virtual void disable() { method_ = WindowDitherer::dither_null; }
-+	virtual void disable() { method_ = &WindowDitherer::dither_null; }
++	virtual void disable() { method_ = NULL; }
  	MonoMethod method_;
  	void dither(const u_char* frm, u_int off, u_int x,
  		    u_int width, u_int height) const;