Fix build with clang by avoiding shadowing in template definitions.

5 files changed, 66 insertions, 1 deletions

diff --git a/audio/akode/distinfo b/audio/akode/distinfo
index 2e8bd7b96a4..bfa294c7938 100644
--- a/audio/akode/distinfo
+++ b/audio/akode/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2011/06/19 03:14:22 dholland Exp $
+$NetBSD: distinfo,v 1.5 2011/08/31 14:43:42 joerg Exp $
 
 SHA1 (30375-akode-2.0.2.tar.bz2) = 10ad1e335bc53c2a90d133b493568324514c729c
 RMD160 (30375-akode-2.0.2.tar.bz2) = fa0322367d8e24e541007d3f9e508c3c31370d96
@@ -14,5 +14,9 @@ SHA1 (patch-ah) = f58249f5d32e86e82a5831a826dafc0590653a5e
 SHA1 (patch-ai) = 0b1196a792259ed573c964f66b68f56adb8a4b0e
 SHA1 (patch-aj) = c8dcff8937b4bf72b34479ac7d701fdf241d14cd
 SHA1 (patch-ak) = 45ce8e7d2ca98c64a56af4f549208de9de89757d
+SHA1 (patch-akode-lib-converter.cpp) = 5eacaa5a85b4ba2262de2e96be291ea247b4594e
+SHA1 (patch-akode-lib-crossfader.cpp) = 4b952c0fa2e1e39b0c530456405297aa33b91ceb
+SHA1 (patch-akode-lib-fast_resampler.cpp) = d244060bf2ab0035296ef96ab7f20460230f1f9c
+SHA1 (patch-akode-lib-volumefilter.cpp) = b070ec761fbb4fe34376f57b953fdc5529cf3068
 SHA1 (patch-akode_plugins_ffmpeg_decoder_ffmpeg__decoder_cpp) = f8b7faae0d3805a342231bcf8efe841e348c0fbe
 SHA1 (patch-al) = b910d7a82a1a341e8b3929e09f6d16470bdbb34f
diff --git a/audio/akode/patches/patch-akode-lib-converter.cpp b/audio/akode/patches/patch-akode-lib-converter.cpp
new file mode 100644
index 00000000000..5bcd18258a8
--- /dev/null
+++ b/audio/akode/patches/patch-akode-lib-converter.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-akode-lib-converter.cpp,v 1.1 2011/08/31 14:43:43 joerg Exp $
+
+--- akode/lib/converter.cpp.orig	2011-08-30 13:57:17.000000000 +0000
++++ akode/lib/converter.cpp
+@@ -26,7 +26,7 @@ namespace aKode {
+ 
+ Converter::Converter(int sample_width) : m_sample_width(sample_width) {}
+ 
+-template<typename T, typename S, template<typename T> class ArithmT, template<typename S> class ArithmS>
++template<typename T, typename S, template<typename U> class ArithmT, template<typename U> class ArithmS>
+ static bool __doFrameFP(AudioFrame* in, AudioFrame* out, int sample_width)
+ {
+     AudioConfiguration config = *in;
diff --git a/audio/akode/patches/patch-akode-lib-crossfader.cpp b/audio/akode/patches/patch-akode-lib-crossfader.cpp
new file mode 100644
index 00000000000..4c363933d51
--- /dev/null
+++ b/audio/akode/patches/patch-akode-lib-crossfader.cpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-akode-lib-crossfader.cpp,v 1.1 2011/08/31 14:43:43 joerg Exp $
+
+--- akode/lib/crossfader.cpp.orig	2011-08-30 13:55:31.000000000 +0000
++++ akode/lib/crossfader.cpp
+@@ -27,7 +27,7 @@ namespace aKode {
+ CrossFader::CrossFader(unsigned int time) : time(time),pos(0) {}
+ 
+ // T is the input/output type, S is the fast arithmetics type, Div is a division method
+-template<typename T, typename S, template<typename S> class Arithm>
++template<typename T, typename S, template<typename U> class Arithm>
+ static bool _doFrame(AudioFrame* in, int& pos, AudioFrame* frame)
+ {
+     T** indata1 = (T**)in->data;
+@@ -66,7 +66,7 @@ static bool _doFrame(AudioFrame* in, int
+ }
+ 
+ // T is the input/output type, S is the fast arithmetics type, Arithm defines devisions
+-template<typename T, typename S, template<typename S> class Arithm>
++template<typename T, typename S, template<typename U> class Arithm>
+ static bool _readFrame(AudioFrame* in, int& pos, AudioFrame* frame)
+ {
+     T** indata = (T**)frame->data;
diff --git a/audio/akode/patches/patch-akode-lib-fast_resampler.cpp b/audio/akode/patches/patch-akode-lib-fast_resampler.cpp
new file mode 100644
index 00000000000..b8b772dcaae
--- /dev/null
+++ b/audio/akode/patches/patch-akode-lib-fast_resampler.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-akode-lib-fast_resampler.cpp,v 1.1 2011/08/31 14:43:43 joerg Exp $
+
+--- akode/lib/fast_resampler.cpp.orig	2011-08-30 13:31:41.000000000 +0000
++++ akode/lib/fast_resampler.cpp
+@@ -37,7 +37,7 @@ FastResampler::FastResampler() : speed(1
+ // A fast resampling by linear interpolation
+ // I assume you know binary arithmetics and convertions if you're reading this
+ // T is the input/output type, Arithm defines the used arithmetic
+-template<typename T, typename S, template<typename S> class Arithm>
++template<typename T, typename S, template<typename U> class Arithm>
+ static bool _doBuffer(AudioFrame* in, AudioFrame* out, float speed, unsigned sample_rate)
+ {
+     unsigned long vt_pos_start = 0;  // virtual positions of new sample
diff --git a/audio/akode/patches/patch-akode-lib-volumefilter.cpp b/audio/akode/patches/patch-akode-lib-volumefilter.cpp
new file mode 100644
index 00000000000..171c5159227
--- /dev/null
+++ b/audio/akode/patches/patch-akode-lib-volumefilter.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-akode-lib-volumefilter.cpp,v 1.1 2011/08/31 14:43:43 joerg Exp $
+
+--- akode/lib/volumefilter.cpp.orig	2011-08-30 13:56:43.000000000 +0000
++++ akode/lib/volumefilter.cpp
+@@ -29,7 +29,7 @@ namespace aKode {
+ VolumeFilter::VolumeFilter() : m_volume(0) {}
+ 
+ // T is the input/output type, S is the fast arithmetics type, Arithm is a division definition
+-template<typename T, typename S, template<typename S> class Arithm>
++template<typename T, typename S, template<typename U> class Arithm>
+ static bool _doFrame(AudioFrame* in, AudioFrame* out, int volume)
+ {
+     T** indata = (T**)in->data;