Fri Aug 5 18:21:14 2011 UTC ()
Add comments to patches.


(wiz)
diff -r1.5 -r1.6 pkgsrc/graphics/libvideogfx/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/libvideogfx/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/graphics/libvideogfx/patches/patch-ad
diff -r1.1 -r1.2 pkgsrc/graphics/libvideogfx/patches/patch-ae
diff -r1.1 -r1.2 pkgsrc/graphics/libvideogfx/patches/patch-af
diff -r1.1 -r1.2 pkgsrc/graphics/libvideogfx/patches/patch-ag
diff -r1.2 -r1.3 pkgsrc/graphics/libvideogfx/patches/patch-ac
cvs diff -r1.5 -r1.6 pkgsrc/graphics/libvideogfx/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/libvideogfx/distinfo 2011/03/28 08:01:20 1.5
+++ pkgsrc/graphics/libvideogfx/distinfo 2011/08/05 18:21:13 1.6
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.5 2011/03/28 08:01:20 wiz Exp $ 1$NetBSD: distinfo,v 1.6 2011/08/05 18:21:13 wiz Exp $
2 2
3SHA1 (libvideogfx-1.0.3.tar.gz) = 1f78e185a05bf063a5f2c9ea4afae1a2d2715b89 3SHA1 (libvideogfx-1.0.3.tar.gz) = 1f78e185a05bf063a5f2c9ea4afae1a2d2715b89
4RMD160 (libvideogfx-1.0.3.tar.gz) = db64375cc2e298b2cd0c7ff95401b913d4cc5236 4RMD160 (libvideogfx-1.0.3.tar.gz) = db64375cc2e298b2cd0c7ff95401b913d4cc5236
5Size (libvideogfx-1.0.3.tar.gz) = 332532 bytes 5Size (libvideogfx-1.0.3.tar.gz) = 332532 bytes
6SHA1 (patch-aa) = 35f558789c9a8704a0324691c1ab53dbc5310850 6SHA1 (patch-aa) = 35f558789c9a8704a0324691c1ab53dbc5310850
7SHA1 (patch-ab) = 69e0eee594c5930f181241b963cd59f6c022beb4 7SHA1 (patch-ab) = 4b74ee809d86a29355019952dc457cbf50b32076
8SHA1 (patch-ac) = 720cac4ec2a0df8bb44fb4834dd245dc8e693166 8SHA1 (patch-ac) = 617e3f449a67718a36532a7e549ce798a86c5561
9SHA1 (patch-ad) = 9189a999ef64636562014306b7a3e5e138776273 9SHA1 (patch-ad) = 0c02424e0bb876de29d70400314b997f1ce63c4e
10SHA1 (patch-ae) = 6462a94b85a7be12fcff1d36c17b83f640f27b43 10SHA1 (patch-ae) = 979c2c53fb28e5b98c9de0be73c46b2f3415e240
11SHA1 (patch-af) = 06704cb9bfe2a940c676880104c976d2948afe83 11SHA1 (patch-af) = 9d439e6cd14be344dd4ca39e2a319ee9b6b990d1
12SHA1 (patch-ag) = 12ae1ab89d325944f00e46e6584d4b3a691f0b1b 12SHA1 (patch-ag) = f089e49bc735fb107013760cc77a0cd323f8caf2
13SHA1 (patch-libvideogfx_graphics_fileio_png.cc) = d2f0d228b5f3f2a9478709ef9228dd1fa5d62a55 13SHA1 (patch-libvideogfx_graphics_fileio_png.cc) = d2f0d228b5f3f2a9478709ef9228dd1fa5d62a55
cvs diff -r1.1 -r1.2 pkgsrc/graphics/libvideogfx/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/libvideogfx/patches/patch-ab 2006/01/15 20:34:13 1.1
+++ pkgsrc/graphics/libvideogfx/patches/patch-ab 2011/08/05 18:21:13 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ab,v 1.1 2006/01/15 20:34:13 joerg Exp $ 1$NetBSD: patch-ab,v 1.2 2011/08/05 18:21:13 wiz Exp $
 2
 3Try to fix stricter GCC 3.4 template handling.
2 4
3--- libvideogfx/graphics/datatypes/bitmap.hh.orig 2006-01-15 20:11:54.000000000 +0000 5--- libvideogfx/graphics/datatypes/bitmap.hh.orig 2006-01-15 20:11:54.000000000 +0000
4+++ libvideogfx/graphics/datatypes/bitmap.hh 6+++ libvideogfx/graphics/datatypes/bitmap.hh
5@@ -222,26 +222,26 @@ namespace videogfx { 7@@ -222,26 +222,26 @@ namespace videogfx {
6 { 8 {
7 Create(w,h,border,halign,valign); 9 Create(w,h,border,halign,valign);
8 } 10 }
9- ~BitmapProvider_Mem() { if (d_bitmap_ptr) delete[] d_bitmap_ptr; } 11- ~BitmapProvider_Mem() { if (d_bitmap_ptr) delete[] d_bitmap_ptr; }
10+ ~BitmapProvider_Mem() { if (this->d_bitmap_ptr) delete[] this->d_bitmap_ptr; } 12+ ~BitmapProvider_Mem() { if (this->d_bitmap_ptr) delete[] this->d_bitmap_ptr; }
11  13
12 void Create(int w,int h,int border=0,int halign=1,int valign=1) 14 void Create(int w,int h,int border=0,int halign=1,int valign=1)
13 { 15 {
14 CalcInternalSizes(w,h,border,halign,valign, 16 CalcInternalSizes(w,h,border,halign,valign,
cvs diff -r1.1 -r1.2 pkgsrc/graphics/libvideogfx/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/graphics/libvideogfx/patches/patch-ad 2006/01/15 20:34:13 1.1
+++ pkgsrc/graphics/libvideogfx/patches/patch-ad 2011/08/05 18:21:13 1.2
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: patch-ad,v 1.1 2006/01/15 20:34:13 joerg Exp $ 1$NetBSD: patch-ad,v 1.2 2011/08/05 18:21:13 wiz Exp $
 2
 3Be nice and include sys/types.h before sys/ipc.h.
2 4
3--- libvideogfx/x11/imgwin.cc.orig 2006-01-15 20:21:10.000000000 +0000 5--- libvideogfx/x11/imgwin.cc.orig 2006-01-15 20:21:10.000000000 +0000
4+++ libvideogfx/x11/imgwin.cc 6+++ libvideogfx/x11/imgwin.cc
5@@ -19,6 +19,7 @@ 7@@ -19,6 +19,7 @@
6  8
7 #include "config.h" 9 #include "config.h"
8  10
9+#include <sys/types.h> 11+#include <sys/types.h>
10 #include <time.h> 12 #include <time.h>
11 #include <sys/ipc.h> 13 #include <sys/ipc.h>
12 #include <sys/shm.h> 14 #include <sys/shm.h>
cvs diff -r1.1 -r1.2 pkgsrc/graphics/libvideogfx/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/graphics/libvideogfx/patches/patch-ae 2006/01/15 20:34:13 1.1
+++ pkgsrc/graphics/libvideogfx/patches/patch-ae 2011/08/05 18:21:13 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-ae,v 1.1 2006/01/15 20:34:13 joerg Exp $ 1$NetBSD: patch-ae,v 1.2 2011/08/05 18:21:13 wiz Exp $
 2
 3Try to fix stricter GCC 3.4 template handling.
2 4
3--- libvideogfx/containers/heap.icc.orig 2006-01-15 20:22:18.000000000 +0000 5--- libvideogfx/containers/heap.icc.orig 2006-01-15 20:22:18.000000000 +0000
4+++ libvideogfx/containers/heap.icc 6+++ libvideogfx/containers/heap.icc
5@@ -35,7 +35,7 @@ template <class T> void Heap<T>::Insert( 7@@ -35,7 +35,7 @@ template <class T> void Heap<T>::Insert(
6  8
7 if (d_entries==d_size) 9 if (d_entries==d_size)
8 { 10 {
9- int newsize = max(max(d_size*2,d_size+10),INITIAL_HEAP_SIZE); 11- int newsize = max(max(d_size*2,d_size+10),INITIAL_HEAP_SIZE);
10+ int newsize = this->max(this->max(d_size*2,d_size+10),INITIAL_HEAP_SIZE); 12+ int newsize = this->max(this->max(d_size*2,d_size+10),INITIAL_HEAP_SIZE);
11 assert(newsize>d_size); 13 assert(newsize>d_size);
12  14
13 T* newheap = new T[newsize+1]; // Create array for new heap including an extra dummy element [0]. 15 T* newheap = new T[newsize+1]; // Create array for new heap including an extra dummy element [0].
cvs diff -r1.1 -r1.2 pkgsrc/graphics/libvideogfx/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/graphics/libvideogfx/patches/patch-af 2006/01/15 20:34:13 1.1
+++ pkgsrc/graphics/libvideogfx/patches/patch-af 2011/08/05 18:21:13 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-af,v 1.1 2006/01/15 20:34:13 joerg Exp $ 1$NetBSD: patch-af,v 1.2 2011/08/05 18:21:13 wiz Exp $
 2
 3Try to fix stricter GCC 3.4 template handling.
2 4
3--- libvideogfx/utility/smartpointer.hh.orig 2006-01-15 20:23:53.000000000 +0000 5--- libvideogfx/utility/smartpointer.hh.orig 2006-01-15 20:23:53.000000000 +0000
4+++ libvideogfx/utility/smartpointer.hh 6+++ libvideogfx/utility/smartpointer.hh
5@@ -51,7 +51,7 @@ namespace videogfx { 7@@ -51,7 +51,7 @@ namespace videogfx {
6 public: 8 public:
7 SP() 9 SP()
8 { 10 {
9- counter = NULL; 11- counter = NULL;
10+ this->counter = NULL; 12+ this->counter = NULL;
11 pointer = NULL; 13 pointer = NULL;
12 } 14 }
13  15
14@@ -159,8 +159,8 @@ namespace videogfx { 16@@ -159,8 +159,8 @@ namespace videogfx {
cvs diff -r1.1 -r1.2 pkgsrc/graphics/libvideogfx/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/graphics/libvideogfx/patches/patch-ag 2006/01/15 20:34:13 1.1
+++ pkgsrc/graphics/libvideogfx/patches/patch-ag 2011/08/05 18:21:13 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ag,v 1.1 2006/01/15 20:34:13 joerg Exp $ 1$NetBSD: patch-ag,v 1.2 2011/08/05 18:21:13 wiz Exp $
 2
 3Try to fix stricter GCC 3.4 template handling.
2 4
3--- libvideogfx/graphics/datatypes/primitives.hh.orig 2006-01-15 20:26:10.000000000 +0000 5--- libvideogfx/graphics/datatypes/primitives.hh.orig 2006-01-15 20:26:10.000000000 +0000
4+++ libvideogfx/graphics/datatypes/primitives.hh 6+++ libvideogfx/graphics/datatypes/primitives.hh
5@@ -35,6 +35,8 @@ 7@@ -35,6 +35,8 @@
6 #ifndef LIBVIDEOGFX_GRAPHICS_DATATYPES_PRIMITIVES_HH 8 #ifndef LIBVIDEOGFX_GRAPHICS_DATATYPES_PRIMITIVES_HH
7 #define LIBVIDEOGFX_GRAPHICS_DATATYPES_PRIMITIVES_HH 9 #define LIBVIDEOGFX_GRAPHICS_DATATYPES_PRIMITIVES_HH
8  10
9+#include <cmath> 11+#include <cmath>
10+ 12+
11 namespace videogfx { 13 namespace videogfx {
12  14
13 template <class T> struct Point2D 15 template <class T> struct Point2D
14@@ -52,7 +54,7 @@ namespace videogfx { 16@@ -52,7 +54,7 @@ namespace videogfx {
cvs diff -r1.2 -r1.3 pkgsrc/graphics/libvideogfx/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/graphics/libvideogfx/patches/patch-ac 2010/06/12 14:05:40 1.2
+++ pkgsrc/graphics/libvideogfx/patches/patch-ac 2011/08/05 18:21:13 1.3
@@ -1,14 +1,18 @@ @@ -1,14 +1,18 @@
1$NetBSD: patch-ac,v 1.2 2010/06/12 14:05:40 wiz Exp $ 1$NetBSD: patch-ac,v 1.3 2011/08/05 18:21:13 wiz Exp $
 2
 3Be nice and include sys/types.h before sys/ipc.h.
 4
 5Fix build with latest XShm from xsrc. Hopefully still works with other Xs.
2 6
3--- libvideogfx/x11/dispimg.cc.orig 2002-05-27 14:02:43.000000000 +0000 7--- libvideogfx/x11/dispimg.cc.orig 2002-05-27 14:02:43.000000000 +0000
4+++ libvideogfx/x11/dispimg.cc 8+++ libvideogfx/x11/dispimg.cc
5@@ -19,6 +19,7 @@ 9@@ -19,6 +19,7 @@
6  10
7 #include "config.h" 11 #include "config.h"
8  12
9+#include <sys/types.h> 13+#include <sys/types.h>
10 #include <assert.h> 14 #include <assert.h>
11 #include <time.h> 15 #include <time.h>
12 #include <sys/ipc.h> 16 #include <sys/ipc.h>
13@@ -32,6 +33,8 @@ using namespace std; 17@@ -32,6 +33,8 @@ using namespace std;
14  18