Fix GCC 3.4+ issues: missing template before explicit instantiation,

missing this for non-template parameter methods.

4 files changed, 80 insertions, 1 deletions

diff --git a/multimedia/vls/distinfo b/multimedia/vls/distinfo
index ec5b96744aa..1086d71bcf9 100644
--- a/multimedia/vls/distinfo
+++ b/multimedia/vls/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/04/29 18:45:00 kristerw Exp $
+$NetBSD: distinfo,v 1.4 2006/01/03 14:04:27 joerg Exp $
 
 SHA1 (vls-0.5.6.tar.gz) = 830df3a353d36453e622474b7813448c439f9d71
 RMD160 (vls-0.5.6.tar.gz) = 4f88c59b4fd96df1ea4d46b66467fa3287776c2c
@@ -7,3 +7,6 @@ SHA1 (patch-aa) = cadf79b4a1244492d48def104590468b52098527
 SHA1 (patch-ab) = 30b9ba716e80972a7d4cb0cf75efc715086812b1
 SHA1 (patch-ac) = bcc44065d4c45db8c96b5ddd307d61242d70f002
 SHA1 (patch-ad) = 1a75b2990c60afdbe47575bfe745be0d86a379c0
+SHA1 (patch-ae) = 7cb52a8e9d7a095ecb01af2ebfdfc639d0886e59
+SHA1 (patch-af) = 5cda5b979012a143345f179c9f95c4e2c709e59f
+SHA1 (patch-ag) = 9c45a5be74f46c67caca043a28de7d36bfc9564c
diff --git a/multimedia/vls/patches/patch-ae b/multimedia/vls/patches/patch-ae
new file mode 100644
index 00000000000..8df92fe8b4d
--- /dev/null
+++ b/multimedia/vls/patches/patch-ae
@@ -0,0 +1,31 @@
+$NetBSD: patch-ae,v 1.1 2006/01/03 14:04:27 joerg Exp $
+
+--- src/core/hashtable.h.orig	2006-01-03 13:42:06.000000000 +0000
++++ src/core/hashtable.h
+@@ -63,7 +63,7 @@ template <class T> class C_HashMethod
+ };
+ 
+ 
+-class C_HashMethod<u32>
++template <> class C_HashMethod<u32>
+ {
+  public:
+   inline C_HashMethod(u32 uiMaxHash);
+@@ -76,7 +76,7 @@ class C_HashMethod<u32>
+ };
+ 
+ 
+-class C_HashMethod<u16>
++template <> class C_HashMethod<u16>
+ {
+  public:
+   inline C_HashMethod(u32 uiMaxHash);
+@@ -89,7 +89,7 @@ class C_HashMethod<u16>
+ };
+ 
+ 
+-class C_HashMethod<handle>
++template<> class C_HashMethod<handle>
+ {
+  public:
+   inline C_HashMethod(u32 uiMaxHash);
diff --git a/multimedia/vls/patches/patch-af b/multimedia/vls/patches/patch-af
new file mode 100644
index 00000000000..a901455169a
--- /dev/null
+++ b/multimedia/vls/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1 2006/01/03 14:04:27 joerg Exp $
+
+--- src/core/library.cpp.orig	2006-01-03 13:40:01.000000000 +0000
++++ src/core/library.cpp
+@@ -25,7 +25,9 @@
+ *
+ *******************************************************************************/
+ 
+-
++#ifdef HAVE_DLFCN_H
++#include <dlfcn.h>                                              // For library.h
++#endif
+ 
+ //------------------------------------------------------------------------------
+ // Preamble
diff --git a/multimedia/vls/patches/patch-ag b/multimedia/vls/patches/patch-ag
new file mode 100644
index 00000000000..801db5ddccd
--- /dev/null
+++ b/multimedia/vls/patches/patch-ag
@@ -0,0 +1,30 @@
+$NetBSD: patch-ag,v 1.1 2006/01/03 14:04:27 joerg Exp $
+
+--- src/core/stream.cpp.orig	2006-01-03 13:54:46.000000000 +0000
++++ src/core/stream.cpp
+@@ -319,7 +319,7 @@ template <class IOStream>
+ {
+   try
+   {
+-    u32 iByteCount = cSerializer.NextBytesCount();
++    u32 iByteCount = this->cSerializer.NextBytesCount();
+     while(iByteCount > 0)
+     {
+       const byte aBytes[iByteCount];
+@@ -332,13 +332,13 @@ template <class IOStream>
+         ASSERT(iRc >= 0 || iRc == FILE_EOF);
+         iOffset += iRc;
+       }
+-      while(iByteCount > 0 && iRc != FILE_EOF);
++      while(iByteCount > 0 && this->iRc != FILE_EOF);
+ 
+       // Deserialize them
+-      cSerializer.SetNextBytes(&aBytes);
++      this->cSerializer.SetNextBytes(&aBytes);
+ 
+       // Next iteration
+-      iByteCount = cSerializer.NextBytesCount();
++      iByteCount = this->cSerializer.NextBytesCount();
+     }
+   }
+   catch(E_Exception e)