Gcc 4 fix wrt bug #153361

(Portage version: 2.1.2_rc1-r2)

4 files changed, 47 insertions, 6 deletions

diff --git a/media-sound/tapiir/ChangeLog b/media-sound/tapiir/ChangeLog
index 87dc4d8c9c09..2f76380290af 100644
--- a/media-sound/tapiir/ChangeLog
+++ b/media-sound/tapiir/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/tapiir
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tapiir/ChangeLog,v 1.15 2005/07/25 19:13:59 dholm Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tapiir/ChangeLog,v 1.16 2006/11/01 13:24:01 aballier Exp $
+
+  01 Nov 2006; Alexis Ballier <aballier@gentoo.org>
+  +files/tapiir-0.7.1-gcc4.patch, tapiir-0.7.1.ebuild:
+  Gcc 4 fix wrt bug #153361
 
   25 Jul 2005; David Holm <dholm@gentoo.org> tapiir-0.7.1.ebuild:
   Added to ~ppc.
diff --git a/media-sound/tapiir/files/digest-tapiir-0.7.1 b/media-sound/tapiir/files/digest-tapiir-0.7.1
index 466f3aa7a475..0ee7e18fc376 100644
--- a/media-sound/tapiir/files/digest-tapiir-0.7.1
+++ b/media-sound/tapiir/files/digest-tapiir-0.7.1
@@ -1 +1,3 @@
 MD5 3ffd0523ee293c0d6bd536928c4f13ee tapiir-0.7.1.tar.gz 169778
+RMD160 04f4ba95b2517e54ea8882f500701dd879217c9c tapiir-0.7.1.tar.gz 169778
+SHA256 159e8ad7b1edb80b4431584f194fd440892d170483f96d43af6dd1afd74f4ec6 tapiir-0.7.1.tar.gz 169778
diff --git a/media-sound/tapiir/files/tapiir-0.7.1-gcc4.patch b/media-sound/tapiir/files/tapiir-0.7.1-gcc4.patch
new file mode 100644
index 000000000000..cdd68e1be0b8
--- /dev/null
+++ b/media-sound/tapiir/files/tapiir-0.7.1-gcc4.patch
@@ -0,0 +1,34 @@
+--- src/MTD.hxx.old	2006-11-01 14:18:31.000000000 +0100
++++ src/MTD.hxx	2006-11-01 14:18:34.000000000 +0100
+@@ -193,22 +193,22 @@
+ 
+ /****************************** specializations ******************************/
+ 
+-inline float MTD<int,short>::FromGain(const int& g) const { return float(g)/256.; }
+-inline float MTD<int,float>::FromGain(const int& g) const { return float(g)/256.; }
++template <> inline float MTD<int,short>::FromGain(const int& g) const { return float(g)/256.; }
++template <> inline float MTD<int,float>::FromGain(const int& g) const { return float(g)/256.; }
+ 
+-inline int   MTD<int,short>::ToGain(const float& f) const { return (int)(f*256.); }
+-inline int   MTD<int,float>::ToGain(const float& f) const { return (int)(f*256.); }
++template <> inline int   MTD<int,short>::ToGain(const float& f) const { return (int)(f*256.); }
++template <> inline int   MTD<int,float>::ToGain(const float& f) const { return (int)(f*256.); }
+ 
+-inline void  MTD<float,short>::Clip( float& f) const
++template <> inline void  MTD<float,short>::Clip( float& f) const
+ { if (f>32767.) f = 32767.; else if (f<-32767.) f = -32767.; }
+-inline void  MTD<int  ,short>::Clip( int&   i) const
++template <> inline void  MTD<int  ,short>::Clip( int&   i) const
+ { if (i>32767) i = 32767; else if (i<-32767) i = -32767; }
+-inline void  MTD<float,float>::Clip( float& f) const
++template <> inline void  MTD<float,float>::Clip( float& f) const
+ { if (f>1.) f = 1.; else if (f<-1.) f = -1.; }
+ 
+ 
+-inline void  MTD<int,float>::MulAdj( int& i) const { i>>=8; }
+-inline void  MTD<int,short>::MulAdj( int& i) const { i>>=8; }
++template <> inline void  MTD<int,float>::MulAdj( int& i) const { i>>=8; }
++template <> inline void  MTD<int,short>::MulAdj( int& i) const { i>>=8; }
+ 
+ /*****************************************************************************/
+ 
diff --git a/media-sound/tapiir/tapiir-0.7.1.ebuild b/media-sound/tapiir/tapiir-0.7.1.ebuild
index ea8829ceb0e5..f9394754b669 100644
--- a/media-sound/tapiir/tapiir-0.7.1.ebuild
+++ b/media-sound/tapiir/tapiir-0.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tapiir/tapiir-0.7.1.ebuild,v 1.14 2005/07/25 19:13:59 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tapiir/tapiir-0.7.1.ebuild,v 1.15 2006/11/01 13:24:01 aballier Exp $
 
 inherit eutils
 
@@ -20,9 +20,10 @@ DEPEND="media-sound/jack-audio-connection-kit
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/${P}-gcc3.patch
+	epatch "${FILESDIR}/${P}-gcc3.patch"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
 	sed -i "/#include <alsa\\/asoundlib.h>/i\\#define ALSA_PCM_OLD_HW_PARAMS_API 1\\" src/alsaio.cxx
 }