Be nice and include sys/types.h before sys/ipc.h.

Try to fix stricter GCC 3.4 template handling.

7 files changed, 132 insertions, 1 deletions

diff --git a/graphics/libvideogfx/distinfo b/graphics/libvideogfx/distinfo
index bd78892c7c1..d063c05fecf 100644
--- a/graphics/libvideogfx/distinfo
+++ b/graphics/libvideogfx/distinfo
@@ -1,6 +1,12 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 08:45:09 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/01/15 20:34:13 joerg Exp $
 
 SHA1 (libvideogfx-1.0.3.tar.gz) = 1f78e185a05bf063a5f2c9ea4afae1a2d2715b89
 RMD160 (libvideogfx-1.0.3.tar.gz) = db64375cc2e298b2cd0c7ff95401b913d4cc5236
 Size (libvideogfx-1.0.3.tar.gz) = 332532 bytes
 SHA1 (patch-aa) = 35f558789c9a8704a0324691c1ab53dbc5310850
+SHA1 (patch-ab) = 69e0eee594c5930f181241b963cd59f6c022beb4
+SHA1 (patch-ac) = c86809f7fe594d44039039f0eac9c58e86def1dc
+SHA1 (patch-ad) = 9189a999ef64636562014306b7a3e5e138776273
+SHA1 (patch-ae) = 6462a94b85a7be12fcff1d36c17b83f640f27b43
+SHA1 (patch-af) = 06704cb9bfe2a940c676880104c976d2948afe83
+SHA1 (patch-ag) = 12ae1ab89d325944f00e46e6584d4b3a691f0b1b
diff --git a/graphics/libvideogfx/patches/patch-ab b/graphics/libvideogfx/patches/patch-ab
new file mode 100644
index 00000000000..e948cdd48df
--- /dev/null
+++ b/graphics/libvideogfx/patches/patch-ab
@@ -0,0 +1,42 @@
+$NetBSD: patch-ab,v 1.1 2006/01/15 20:34:13 joerg Exp $
+
+--- libvideogfx/graphics/datatypes/bitmap.hh.orig	2006-01-15 20:11:54.000000000 +0000
++++ libvideogfx/graphics/datatypes/bitmap.hh
+@@ -222,26 +222,26 @@ namespace videogfx {
+     {
+       Create(w,h,border,halign,valign);
+     }
+-    ~BitmapProvider_Mem() { if (d_bitmap_ptr) delete[] d_bitmap_ptr; }
++    ~BitmapProvider_Mem() { if (this->d_bitmap_ptr) delete[] this->d_bitmap_ptr; }
+ 
+     void Create(int w,int h,int border=0,int halign=1,int valign=1)
+     {
+       CalcInternalSizes(w,h,border,halign,valign,
+-			d_internal_width,d_internal_height,border);
++			this->d_internal_width,this->d_internal_height,border);
+ 
+       // total size including border
+ 
+-      d_total_width  = d_internal_width +2*border;
+-      d_total_height = d_internal_height+2*border;
++      this->d_total_width  = this->d_internal_width +2*border;
++      this->d_total_height = this->d_internal_height+2*border;
+ 
+-      if (d_bitmap_ptr)
+-	delete[] d_bitmap_ptr;
++      if (this->d_bitmap_ptr)
++	delete[] this->d_bitmap_ptr;
+ 
+-      d_bitmap_ptr = new Pel[d_total_width * d_total_height];
+-      d_width  = w;
+-      d_height = h;
+-      d_border = border;
+-      SetFramePtrs();
++      this->d_bitmap_ptr = new Pel[this->d_total_width * this->d_total_height];
++      this->d_width  = w;
++      this->d_height = h;
++      this->d_border = border;
++      this->SetFramePtrs();
+     }
+   };
+ 
diff --git a/graphics/libvideogfx/patches/patch-ac b/graphics/libvideogfx/patches/patch-ac
new file mode 100644
index 00000000000..d3fab38f151
--- /dev/null
+++ b/graphics/libvideogfx/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2006/01/15 20:34:13 joerg Exp $
+
+--- libvideogfx/x11/dispimg.cc.orig	2006-01-15 20:20:09.000000000 +0000
++++ libvideogfx/x11/dispimg.cc
+@@ -19,6 +19,7 @@
+ 
+ #include "config.h"
+ 
++#include <sys/types.h>
+ #include <assert.h>
+ #include <time.h>
+ #include <sys/ipc.h>
diff --git a/graphics/libvideogfx/patches/patch-ad b/graphics/libvideogfx/patches/patch-ad
new file mode 100644
index 00000000000..c8991d275e5
--- /dev/null
+++ b/graphics/libvideogfx/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2006/01/15 20:34:13 joerg Exp $
+
+--- libvideogfx/x11/imgwin.cc.orig	2006-01-15 20:21:10.000000000 +0000
++++ libvideogfx/x11/imgwin.cc
+@@ -19,6 +19,7 @@
+ 
+ #include "config.h"
+ 
++#include <sys/types.h>
+ #include <time.h>
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
diff --git a/graphics/libvideogfx/patches/patch-ae b/graphics/libvideogfx/patches/patch-ae
new file mode 100644
index 00000000000..f77ec266a14
--- /dev/null
+++ b/graphics/libvideogfx/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2006/01/15 20:34:13 joerg Exp $
+
+--- libvideogfx/containers/heap.icc.orig	2006-01-15 20:22:18.000000000 +0000
++++ libvideogfx/containers/heap.icc
+@@ -35,7 +35,7 @@ template <class T> void Heap<T>::Insert(
+ 
+   if (d_entries==d_size)
+     {
+-      int newsize = max(max(d_size*2,d_size+10),INITIAL_HEAP_SIZE);
++      int newsize = this->max(this->max(d_size*2,d_size+10),INITIAL_HEAP_SIZE);
+       assert(newsize>d_size);
+ 
+       T* newheap = new T[newsize+1]; // Create array for new heap including an extra dummy element [0].
diff --git a/graphics/libvideogfx/patches/patch-af b/graphics/libvideogfx/patches/patch-af
new file mode 100644
index 00000000000..edfc0b9be8d
--- /dev/null
+++ b/graphics/libvideogfx/patches/patch-af
@@ -0,0 +1,24 @@
+$NetBSD: patch-af,v 1.1 2006/01/15 20:34:13 joerg Exp $
+
+--- libvideogfx/utility/smartpointer.hh.orig	2006-01-15 20:23:53.000000000 +0000
++++ libvideogfx/utility/smartpointer.hh
+@@ -51,7 +51,7 @@ namespace videogfx {
+   public:
+     SP()
+     {
+-      counter = NULL;
++      this->counter = NULL;
+       pointer = NULL;
+     }
+ 
+@@ -159,8 +159,8 @@ namespace videogfx {
+       return *this;
+     }
+ 
+-    operator T*()   { AssertDescr(counter,"smart pointer is NULL"); return pointer; }
+-    T& operator()() { AssertDescr(counter,"smart pointer is NULL"); return *pointer; }
++    operator T*()   { AssertDescr(this->counter,"smart pointer is NULL"); return pointer; }
++    T& operator()() { AssertDescr(this->counter,"smart pointer is NULL"); return *pointer; }
+ 
+     void Decouple()
+     {
diff --git a/graphics/libvideogfx/patches/patch-ag b/graphics/libvideogfx/patches/patch-ag
new file mode 100644
index 00000000000..7a3f72ef6a4
--- /dev/null
+++ b/graphics/libvideogfx/patches/patch-ag
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.1 2006/01/15 20:34:13 joerg Exp $
+
+--- libvideogfx/graphics/datatypes/primitives.hh.orig	2006-01-15 20:26:10.000000000 +0000
++++ libvideogfx/graphics/datatypes/primitives.hh
+@@ -35,6 +35,8 @@
+ #ifndef LIBVIDEOGFX_GRAPHICS_DATATYPES_PRIMITIVES_HH
+ #define LIBVIDEOGFX_GRAPHICS_DATATYPES_PRIMITIVES_HH
+ 
++#include <cmath>
++
+ namespace videogfx {
+ 
+   template <class T> struct Point2D
+@@ -52,7 +54,7 @@ namespace videogfx {
+ 
+     T x,y;
+ 
+-    T Length() const { return (T)sqrt((double)(x*x+y*y)); }
++    T Length() const { return (T)std::sqrt((double)(x*x+y*y)); }
+   };
+ 
+   template <class T> struct Rect2D