Fix build with GCC 4.x:

- Remove class name from member declarations.
- Fix inconsistent use of C and C++ linkage.

6 files changed, 79 insertions, 1 deletions

diff --git a/multimedia/libflash/distinfo b/multimedia/libflash/distinfo
index 55cba9c9be5..1d00a4c4c0d 100644
--- a/multimedia/libflash/distinfo
+++ b/multimedia/libflash/distinfo
@@ -1,13 +1,18 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 11:24:03 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/06/30 21:47:20 tron Exp $
 
 SHA1 (flash-0.4.10.tgz) = 41f2b8bba3e551e611913069e6e650bc4c8ab420
 RMD160 (flash-0.4.10.tgz) = 17c04bb9fd29ab9b91fbc2954e508aead1ab7fb1
 Size (flash-0.4.10.tgz) = 358995 bytes
+SHA1 (patch-aa) = 0cda07497c07a3a6e4bc13ae099812bab4bc0424
 SHA1 (patch-ab) = 29afb4393acc2c44e622d398dba05749fb5c581d
 SHA1 (patch-ac) = ce803268d7c85e0317c61dbd63c56028eaba82a8
 SHA1 (patch-ad) = a67db33d60bc5ce23241e5f445aabb9bdb1864c2
+SHA1 (patch-ae) = 51d94184f123596c662f3e3d7de36acb507b303c
 SHA1 (patch-af) = f0c7f279ac3295b5bef7de8d5405b04de33260c0
 SHA1 (patch-ag) = cc6277a63c4bfa54a35b74a1a66dea5923ae8637
 SHA1 (patch-ah) = d4406e8e672762b8ec474acf4923ded2301ad5a9
 SHA1 (patch-ai) = a4f927b4698e7de7b46f2496b57c83a30a57fecb
 SHA1 (patch-aj) = d37351360b7e703747b4742e0378f89c528bdef7
+SHA1 (patch-ak) = c1af17f7bdf427894ed23893aad708ad0cdd51ed
+SHA1 (patch-al) = 8fdf2b0f9655c19e7cd8ff4aeb23c42c32e9a136
+SHA1 (patch-am) = 65afd3a402415a2cf9675fd107ed4caf192a9648
diff --git a/multimedia/libflash/patches/patch-aa b/multimedia/libflash/patches/patch-aa
new file mode 100644
index 00000000000..3c22696338f
--- /dev/null
+++ b/multimedia/libflash/patches/patch-aa
@@ -0,0 +1,20 @@
+$NetBSD: patch-aa,v 1.1 2006/06/30 21:47:20 tron Exp $
+
+--- Lib/matrix.h.orig	1999-08-07 14:24:02.000000000 +0100
++++ Lib/matrix.h	2006-06-30 22:37:20.000000000 +0100
+@@ -33,13 +33,13 @@
+ #endif
+ 
+ 	inline
+-	long Matrix::getX(long x, long y)
++	long getX(long x, long y)
+ 	{
+ 		return (long) (x*a+y*b+tx);
+ 	};
+ 
+ 	inline
+-	long Matrix::getY(long x, long y)
++	long getY(long x, long y)
+ 	{
+ 		return (long) (x*c+y*d+ty);
+ 	};
diff --git a/multimedia/libflash/patches/patch-ae b/multimedia/libflash/patches/patch-ae
new file mode 100644
index 00000000000..a811575faf7
--- /dev/null
+++ b/multimedia/libflash/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2006/06/30 21:47:20 tron Exp $
+
+--- Lib/graphic16.h.orig	2000-06-04 09:53:53.000000000 +0100
++++ Lib/graphic16.h	2006-06-30 22:39:22.000000000 +0100
+@@ -24,7 +24,7 @@
+ 
+ class GraphicDevice16: public GraphicDevice {
+ private:
+-	long GraphicDevice16::allocColor(Color color);
++	long allocColor(Color color);
+ 
+ public:
+ 	GraphicDevice16(FlashDisplay *fd);
diff --git a/multimedia/libflash/patches/patch-ak b/multimedia/libflash/patches/patch-ak
new file mode 100644
index 00000000000..98abc458dd1
--- /dev/null
+++ b/multimedia/libflash/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2006/06/30 21:47:20 tron Exp $
+
+--- Lib/graphic24.h.orig	2000-06-04 10:06:44.000000000 +0100
++++ Lib/graphic24.h	2006-06-30 22:40:27.000000000 +0100
+@@ -24,7 +24,7 @@
+ 
+ class GraphicDevice24: public GraphicDevice {
+ private:
+-	long GraphicDevice24::allocColor(Color color);
++	long allocColor(Color color);
+ 
+ public:
+ 	GraphicDevice24(FlashDisplay *fd);
diff --git a/multimedia/libflash/patches/patch-al b/multimedia/libflash/patches/patch-al
new file mode 100644
index 00000000000..c7292b24018
--- /dev/null
+++ b/multimedia/libflash/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2006/06/30 21:47:20 tron Exp $
+
+--- Lib/graphic32.h.orig	2000-06-04 10:38:40.000000000 +0100
++++ Lib/graphic32.h	2006-06-30 22:40:56.000000000 +0100
+@@ -24,7 +24,7 @@
+ 
+ class GraphicDevice32: public GraphicDevice {
+ private:
+-	long GraphicDevice32::allocColor(Color color);
++	long allocColor(Color color);
+ 
+ public:
+ 	GraphicDevice32(FlashDisplay *fd);
diff --git a/multimedia/libflash/patches/patch-am b/multimedia/libflash/patches/patch-am
new file mode 100644
index 00000000000..66a86b98217
--- /dev/null
+++ b/multimedia/libflash/patches/patch-am
@@ -0,0 +1,14 @@
+$NetBSD: patch-am,v 1.1 2006/06/30 21:47:20 tron Exp $
+
+--- Lib/swf.h.orig	1999-08-07 14:27:36.000000000 +0100
++++ Lib/swf.h	2006-06-30 22:44:16.000000000 +0100
+@@ -196,7 +196,9 @@
+ #define true 1
+ #endif
+ 
++extern "C" {
+ extern int shape_size,shape_nb,shaperecord_size,shaperecord_nb,style_size,style_nb;
++};
+ 
+ typedef void (*ScanLineFunc)(void *id, long y, long start, long end);
+