adding gcc3 patch. Closes #30889.

4 files changed, 116 insertions, 5 deletions

diff --git a/media-sound/tapiir/ChangeLog b/media-sound/tapiir/ChangeLog
index 1fd4da99ba9c..0c6710633405 100644
--- a/media-sound/tapiir/ChangeLog
+++ b/media-sound/tapiir/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/tapiir
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tapiir/ChangeLog,v 1.2 2003/05/29 12:59:18 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tapiir/ChangeLog,v 1.3 2003/10/13 19:27:16 mholzer Exp $
+
+  14 Oct 2003; Martin Holzer <mholzer@gentoo.org> tapiir-0.7.1.ebuild,
+  files/tapiir-0.7.1-gcc3.patch:
+  adding gcc3 patch. Closes #30889.
 
   29 May 2003; jje <jje@gentoo.org> tapiir-0.7.1.ebuild:
   Fix install dir.
diff --git a/media-sound/tapiir/Manifest b/media-sound/tapiir/Manifest
index a11bce6d04d1..73dd885bf981 100644
--- a/media-sound/tapiir/Manifest
+++ b/media-sound/tapiir/Manifest
@@ -1,3 +1,4 @@
+MD5 e360eaa4b2cc3a5e712686a7f25b7fae ChangeLog 544
+MD5 2461e7a69cf2b69f3d73ec462ca2d957 tapiir-0.7.1.ebuild 907
 MD5 129400b384f4804d81050abef03da3e8 files/digest-tapiir-0.7.1 64
-MD5 bbed2f14f95abd4c92d4a8e44634d39e ChangeLog 399
-MD5 3ae4cf23b300093452262ec6d5b857d7 tapiir-0.7.1.ebuild 829
+MD5 e9418ac273accb63dde90b8282224b25 files/tapiir-0.7.1-gcc3.patch 4632
diff --git a/media-sound/tapiir/files/tapiir-0.7.1-gcc3.patch b/media-sound/tapiir/files/tapiir-0.7.1-gcc3.patch
new file mode 100644
index 000000000000..993f49a39fdc
--- /dev/null
+++ b/media-sound/tapiir/files/tapiir-0.7.1-gcc3.patch
@@ -0,0 +1,100 @@
+diff -ur tapiir-0.7.1/src/MTD.hxx tapiir-0.7.1-gentoo/src/MTD.hxx
+--- tapiir-0.7.1/src/MTD.hxx	2003-02-22 06:06:16.000000000 +1300
++++ tapiir-0.7.1-gentoo/src/MTD.hxx	2003-10-11 21:29:57.000000000 +1300
+@@ -28,7 +28,7 @@
+ 	/**** the following might be specialized for specific data types ****/
+ 	float FromGain(const T& g) const { return (float) g; }
+ 	T ToGain(const float& v) const { return (T) v; }
+-	void MulAdj( T& i ) const { }	
++	void MulAdj( T& i ) const { }
+ 	void Clip( T&) const {}
+ 	
+ public:
+@@ -193,22 +193,22 @@
+ 
+ /****************************** specializations ******************************/
+ 
+-float MTD<int,short>::FromGain(const int& g) const { return float(g)/256.; }
+-float MTD<int,float>::FromGain(const int& g) const { return float(g)/256.; }
++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.; }
+ 
+-int   MTD<int,short>::ToGain(const float& f) const { return (int)(f*256.); }
+-int   MTD<int,float>::ToGain(const float& f) const { return (int)(f*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.); }
+ 
+-void  MTD<float,short>::Clip( float& f) const
++inline void  MTD<float,short>::Clip( float& f) const
+ { if (f>32767.) f = 32767.; else if (f<-32767.) f = -32767.; }
+-void  MTD<int  ,short>::Clip( int&   i) const
++inline void  MTD<int  ,short>::Clip( int&   i) const
+ { if (i>32767) i = 32767; else if (i<-32767) i = -32767; }
+-void  MTD<float,float>::Clip( float& f) const
++inline void  MTD<float,float>::Clip( float& f) const
+ { if (f>1.) f = 1.; else if (f<-1.) f = -1.; }
+ 
+ 
+-void  MTD<int,float>::MulAdj( int& i) const { i>>=8; }
+-void  MTD<int,short>::MulAdj( int& i) const { i>>=8; }
++inline void  MTD<int,float>::MulAdj( int& i) const { i>>=8; }
++inline void  MTD<int,short>::MulAdj( int& i) const { i>>=8; }
+ 
+ /*****************************************************************************/
+ 
+diff -ur tapiir-0.7.1/src/alsaio.cxx tapiir-0.7.1-gentoo/src/alsaio.cxx
+--- tapiir-0.7.1/src/alsaio.cxx	2003-02-26 02:24:24.000000000 +1300
++++ tapiir-0.7.1-gentoo/src/alsaio.cxx	2003-10-06 20:35:48.000000000 +1300
+@@ -402,18 +402,17 @@
+ {
+ 	int k;
+ //-c,--channels  channels                                      default %d
+-	printf("\
+-Usage: %s [OPTION]...
+--h,--help      help
+--P,--pdevice   playback device                               default %s
+--C,--cdevice   capture device                                default %s
+--m,--min       minimum latency in frames                     default %d
+--M,--max       maximum latency in frames                     default %d
+--r,--rate      rate                                          default %d
+--b,--block     block mode                                    default: %s
+--t,--time      maximal tick time in us
+--p,--poll      use poll (wait for event - reduces CPU usage) default: %s
+-",
++	printf("\n"
++"Usage: %s [OPTION]...\n"
++"-h,--help      help\n"
++"-P,--pdevice   playback device                               default %s\n"
++"-C,--cdevice   capture device                                default %s\n"
++"-m,--min       minimum latency in frames                     default %d\n"
++"-M,--max       maximum latency in frames                     default %d\n"
++"-r,--rate      rate                                          default %d\n"
++"-b,--block     block mode                                    default: %s\n"
++"-t,--time      maximal tick time in us\n"
++"-p,--poll      use poll (wait for event - reduces CPU usage) default: %s\n",
+ program,
+ pdevice,cdevice,
+ latency_min,latency_max,channels,rate,block?"on":"off",use_poll?"on":"off"
+diff -ur tapiir-0.7.1/src/jackio.cxx tapiir-0.7.1-gentoo/src/jackio.cxx
+--- tapiir-0.7.1/src/jackio.cxx	2003-02-26 02:24:53.000000000 +1300
++++ tapiir-0.7.1-gentoo/src/jackio.cxx	2003-10-06 20:22:05.000000000 +1300
+@@ -60,13 +60,12 @@
+ static void help(char* program)
+ {
+ 	int k;
+-	printf("\
+-Usage: %s [OPTION]...
+--h,--help                   help
+--C,--cconnect <LEFT,RIGHT>  jack-connect to capture client   default none
+--P,--pconnect <LEFT,RIGHT>  jack-connect to playback client  default none
+--a,--alsaconnect            jack-connect to alsa_pcm
+-",
++	printf("\n"
++"Usage: %s [OPTION]...\n"
++"-h,--help                   help\n"
++"-C,--cconnect <LEFT,RIGHT>  jack-connect to capture client   default none\n"
++"-P,--pconnect <LEFT,RIGHT>  jack-connect to playback client  default none\n"
++"-a,--alsaconnect            jack-connect to alsa_pcm\n",
+ program
+ );
+ }
diff --git a/media-sound/tapiir/tapiir-0.7.1.ebuild b/media-sound/tapiir/tapiir-0.7.1.ebuild
index 84db437153ac..80a33629f42a 100644
--- a/media-sound/tapiir/tapiir-0.7.1.ebuild
+++ b/media-sound/tapiir/tapiir-0.7.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.3 2003/07/12 20:31:00 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tapiir/tapiir-0.7.1.ebuild,v 1.4 2003/10/13 19:27:17 mholzer Exp $
 
 DESCRIPTION=" Tapiir is a simple and flexible audio effects processor, inspired on the classical magnetic tape delay systems"
 HOMEPAGE="http://www.iua.upf.es/~mdeboer/projects/tapiir/"
-SRC_URI="ftp://www.iua.upf.es/pub/mdeboer/projects/tapiir/${P}.tar.gz"
+SRC_URI="ftp://www.iua.upf.es/pub/mdeboer/projects/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -14,6 +14,12 @@ DEPEND="virtual/jack
 	>=media-sound/alsa-driver-0.9
 	x11-libs/fltk"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc3.patch
+}
+
 src_compile() {
 	local myconf
 	myconf="--with-fltk-prefix=/usr/lib/fltk-1.1 \