Gcc 4 fix wrt bug #153361

Package-Manager: portage-2.1.2_rc1-r2

5 files changed, 80 insertions, 10 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/Manifest b/media-sound/tapiir/Manifest
index cab0659ddd92..9400e62f75e8 100644
--- a/media-sound/tapiir/Manifest
+++ b/media-sound/tapiir/Manifest
@@ -1,5 +1,34 @@
-MD5 25d7c647b0e7ec03c1f5508294eb8999 ChangeLog 507
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 a3934d9819ad95cb16f6132eef741675 tapiir-0.7.1.ebuild 1072
-MD5 129400b384f4804d81050abef03da3e8 files/digest-tapiir-0.7.1 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX tapiir-0.7.1-gcc3.patch 4632 RMD160 9ea218e0169727935c1429acf6f2846416a7bed8 SHA1 9cf215b82b6b527de45f5c6f31533c5e920e5a4c SHA256 e9ff1c8a7dbbd73c4cfe279caf63b02068194a1748e7e941f4488f54236ac220
 MD5 e9418ac273accb63dde90b8282224b25 files/tapiir-0.7.1-gcc3.patch 4632
+RMD160 9ea218e0169727935c1429acf6f2846416a7bed8 files/tapiir-0.7.1-gcc3.patch 4632
+SHA256 e9ff1c8a7dbbd73c4cfe279caf63b02068194a1748e7e941f4488f54236ac220 files/tapiir-0.7.1-gcc3.patch 4632
+AUX tapiir-0.7.1-gcc4.patch 1844 RMD160 f23c72e07be82935fd982620d056e02c3498ff0e SHA1 65571f49094ac550b3c2b23afa3934837d9c6bdf SHA256 ff9122da6caf1fa3a71cfd5b355b585875770ed2818cbfae4fe2c2616940166b
+MD5 4fd698ee7247585ce5e534320643b90d files/tapiir-0.7.1-gcc4.patch 1844
+RMD160 f23c72e07be82935fd982620d056e02c3498ff0e files/tapiir-0.7.1-gcc4.patch 1844
+SHA256 ff9122da6caf1fa3a71cfd5b355b585875770ed2818cbfae4fe2c2616940166b files/tapiir-0.7.1-gcc4.patch 1844
+DIST tapiir-0.7.1.tar.gz 169778 RMD160 04f4ba95b2517e54ea8882f500701dd879217c9c SHA1 89fbf800148dc94ae35f16baebad44e615551600 SHA256 159e8ad7b1edb80b4431584f194fd440892d170483f96d43af6dd1afd74f4ec6
+EBUILD tapiir-0.7.1.ebuild 1117 RMD160 d23a158f311e3ec7d8f1a140de5a67ffa07cafe7 SHA1 7d78453dd63ceb60542a1d126d5c8d5cefeca610 SHA256 94564c5fe1cff4a881809027159b677f9d5147bc716b3490cb2dd83776ed6501
+MD5 784a6c8f598a07946398969bfb8c5611 tapiir-0.7.1.ebuild 1117
+RMD160 d23a158f311e3ec7d8f1a140de5a67ffa07cafe7 tapiir-0.7.1.ebuild 1117
+SHA256 94564c5fe1cff4a881809027159b677f9d5147bc716b3490cb2dd83776ed6501 tapiir-0.7.1.ebuild 1117
+MISC ChangeLog 646 RMD160 18719d2bc0a8aa25faeb4f7aeae0f01c0c974697 SHA1 bb65ab7f291206a5b7108a55e1386ae2417fc5fb SHA256 861a80cfbaabba2a25235da4bf5348c01d341263d9482f53a7237f13f73f1a63
+MD5 3f160bf6ac2a620b6b4a4adebfbb6a14 ChangeLog 646
+RMD160 18719d2bc0a8aa25faeb4f7aeae0f01c0c974697 ChangeLog 646
+SHA256 861a80cfbaabba2a25235da4bf5348c01d341263d9482f53a7237f13f73f1a63 ChangeLog 646
+MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
+MD5 d785f869ad8b6df099b337bd460cfb30 files/digest-tapiir-0.7.1 238
+RMD160 1fc712c0710e7baefe03f00bd1d12f7d6a114b96 files/digest-tapiir-0.7.1 238
+SHA256 58100eaee471039f86cfeefbdd3dd2abfa9f438cce30767206c0a564cf9e680b files/digest-tapiir-0.7.1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFSJ/0vFcC4BYPU0oRAi7wAKCJPJHvxD7QseZ+gSk/YL2TMdKq/QCgmmpV
+DAwH3Q0PXiC7JUlWW9lToHE=
+=LkbQ
+-----END PGP SIGNATURE-----
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
 }