Fix building with GCC 4.4 , closes bug #277426

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 173 insertions, 9 deletions

diff --git a/media-radio/gmfsk/ChangeLog b/media-radio/gmfsk/ChangeLog
index 495aee2f153f..d5013b17c939 100644
--- a/media-radio/gmfsk/ChangeLog
+++ b/media-radio/gmfsk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-radio/gmfsk
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/gmfsk/ChangeLog,v 1.8 2007/05/15 13:26:51 bangert Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/gmfsk/ChangeLog,v 1.9 2009/07/20 16:38:39 vostorga Exp $
+
+  20 Jul 2009; Víctor Ostorga <vostorga@gentoo.org> gmfsk-0.6-r1.ebuild,
+  +files/gmfsk-0.6-gcc44.patch:
+  Fix building with GCC 4.4 , closes bug #277426
 
   15 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/media-radio/gmfsk/Manifest b/media-radio/gmfsk/Manifest
index 096597519554..41d672801f59 100644
--- a/media-radio/gmfsk/Manifest
+++ b/media-radio/gmfsk/Manifest
@@ -1,5 +1,6 @@
+AUX gmfsk-0.6-gcc44.patch 4773 RMD160 900b8d0dbda43fb1ed18f0281d91ddced08a19af SHA1 689054e1e8fa864cbf59badfee031f602da95950 SHA256 0c821757a4120e5b36981f901a86505320804c0094c82d0fbd9f0e2178822616
 AUX gmfsk-patch-mt63_dsp.h 800 RMD160 11a6b86e129f4b891002ed6459869940d98b43fb SHA1 139a222fd026388f602926bcd73718d4280119cb SHA256 45c613115b5ac843ae8eab6f64c18a00ea396155a8b3f16f5d6fd1e09d22fe78
 DIST gmfsk-0.6.tar.gz 540765 RMD160 532d2454ccc7fab36e707002c6fda7f9e2ec14cd SHA1 2738bc2b83eb8f2001ed2503c466123ce4b258a5 SHA256 74a42f32b27684eaa145db3291176d7806a8e446aebd679c6ab384cee81d0c95
-EBUILD gmfsk-0.6-r1.ebuild 924 RMD160 89b16be60432c1cdd53fc53e830bd3992c47aecd SHA1 289c82fa391f44a9c85334f680e559daadfb7c22 SHA256 fa267ec42a5c339857a72e1b9887761408f84888254612d0fc3d2693cc0ba9e5
-MISC ChangeLog 1493 RMD160 5ca7261849ae1751f25dcddbb4f444b622b477eb SHA1 1f3ce35975e77ff211bab9eb4e9c9daec3dd5497 SHA256 2f46f6a2ff610993330e7d5acdb52435eb5d1847b49faad8334079a2e1c559b7
+EBUILD gmfsk-0.6-r1.ebuild 939 RMD160 1d8de5d5eac9c5637fd44ce9563994e37ce896ad SHA1 35b92b4a06e1ba6f6c8eec8b912711913e2adcee SHA256 c61cc12c3b8905f18ed1dd1137de163578f41f83dace52c5b14b7af19f0430d5
+MISC ChangeLog 1650 RMD160 89eb758b1cd14b970ca8c6ca10eb88e1bd7955a3 SHA1 eea3654ffa77ebaa77e3c6b88cfe96bf13aa46d8 SHA256 5a0c12a653d60441840fa7cf022d892fc967150bffa3acd89a77b6663307bc35
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
diff --git a/media-radio/gmfsk/files/gmfsk-0.6-gcc44.patch b/media-radio/gmfsk/files/gmfsk-0.6-gcc44.patch
new file mode 100644
index 000000000000..2ce5f46b39dd
--- /dev/null
+++ b/media-radio/gmfsk/files/gmfsk-0.6-gcc44.patch
@@ -0,0 +1,159 @@
+diff -NrU5 gmfsk-0.6.original/src/mfsk/mfskrx.c gmfsk-0.6/src/mfsk/mfskrx.c
+--- gmfsk-0.6.original/src/mfsk/mfskrx.c	2009-07-20 15:49:08.000000000 +0000
++++ gmfsk-0.6/src/mfsk/mfskrx.c	2009-07-20 15:56:08.000000000 +0000
+@@ -54,11 +54,11 @@
+ 
+ static void recvpic(struct trx *trx, complex z)
+ {
+ 	struct mfsk *m = (struct mfsk *) trx->modem;
+ 
+-	m->picf += carg(ccor(m->prevz, z)) * SampleRate / (2.0 * M_PI);
++	m->picf += c_arg(ccor(m->prevz, z)) * SampleRate / (2.0 * M_PI);
+ 	m->prevz = z;
+ 
+ 	if ((m->counter % SAMPLES_PER_PIXEL) == 0) {
+ 		m->picf = 256 * (m->picf / SAMPLES_PER_PIXEL - 1000) / trx->bandwidth;
+ 
+@@ -309,11 +309,11 @@
+ 
+ 	if (m->currsymbol != m->prev1symbol)
+ 		return;
+ 
+ 	z = ccor(m->prev1vector, m->currvector);
+-	x = carg(z) / m->symlen / (2.0 * M_PI / SampleRate);
++	x = c_arg(z) / m->symlen / (2.0 * M_PI / SampleRate);
+ 
+ 	if (x > -m->tonespacing / 2.0 &&  x < m->tonespacing / 2.0)
+ 		trx_set_freq(trx->frequency + (x / 8.0));
+ }
+ 
+diff -NrU5 gmfsk-0.6.original/src/misc/cmplx.c gmfsk-0.6/src/misc/cmplx.c
+--- gmfsk-0.6.original/src/misc/cmplx.c	2009-07-20 15:49:08.000000000 +0000
++++ gmfsk-0.6/src/misc/cmplx.c	2009-07-20 15:55:23.000000000 +0000
+@@ -133,19 +133,19 @@
+ }
+ 
+ /*
+  * Argument of a complex number.
+  */
+-double carg(complex x)
++double c_arg(complex x)
+ {
+ 	return atan2(c_im(x), c_re(x));
+ }
+ 
+ /*
+  * Complex square root.
+  */
+-complex csqrt(complex x)
++complex c_sqrt(complex x)
+ {
+ 	complex z;
+ 
+ 	c_re(z) = sqrt(cmod(x) + c_re(x)) / M_SQRT2;
+ 	c_im(z) = c_im(x) / c_re(z) / 2;
+diff -NrU5 gmfsk-0.6.original/src/misc/cmplx.h gmfsk-0.6/src/misc/cmplx.h
+--- gmfsk-0.6.original/src/misc/cmplx.h	2009-07-20 15:49:08.000000000 +0000
++++ gmfsk-0.6/src/misc/cmplx.h	2009-07-20 15:54:30.000000000 +0000
+@@ -147,19 +147,19 @@
+ }
+ 
+ /*
+  * Argument of a complex number.
+  */
+-extern __inline__ double carg(complex x)
++extern __inline__ double c_arg(complex x)
+ {
+ 	return atan2(c_im(x), c_re(x));
+ }
+ 
+ /*
+  * Complex square root.
+  */
+-extern __inline__ complex csqrt(complex x)
++extern __inline__ complex c_sqrt(complex x)
+ {
+ 	complex z;
+ 
+ 	c_re(z) = sqrt(cmod(x) + c_re(x)) / M_SQRT2;
+ 	c_im(z) = c_im(x) / c_re(z) / 2;
+diff -NrU5 gmfsk-0.6.original/src/misc/misc.c gmfsk-0.6/src/misc/misc.c
+--- gmfsk-0.6.original/src/misc/misc.c	2009-07-20 15:49:08.000000000 +0000
++++ gmfsk-0.6/src/misc/misc.c	2009-07-20 16:17:35.000000000 +0000
+@@ -103,11 +103,11 @@
+ /* ---------------------------------------------------------------------- */
+ 
+ /*
+  * Integer base-2 logarithm
+  */
+-int log2(unsigned int x)
++int log_2(unsigned int x)
+ {
+ 	int y = 0;
+ 
+ 	x >>= 1;
+ 
+diff -NrU5 gmfsk-0.6.original/src/misc/misc.h gmfsk-0.6/src/misc/misc.h
+--- gmfsk-0.6.original/src/misc/misc.h	2009-07-20 15:49:08.000000000 +0000
++++ gmfsk-0.6/src/misc/misc.h	2009-07-20 16:17:21.000000000 +0000
+@@ -104,11 +104,11 @@
+ /* ---------------------------------------------------------------------- */
+ 
+ /*
+  * Integer base-2 logarithm
+  */
+-extern inline int log2(unsigned int x)
++extern inline int log_2(unsigned int x)
+ {
+ 	int y = 0;
+ 
+ 	x >>= 1;
+ 
+diff -NrU5 gmfsk-0.6.original/src/psk31/psk31rx.c gmfsk-0.6/src/psk31/psk31rx.c
+--- gmfsk-0.6.original/src/psk31/psk31rx.c	2009-07-20 15:49:08.000000000 +0000
++++ gmfsk-0.6/src/psk31/psk31rx.c	2009-07-20 15:56:42.000000000 +0000
+@@ -76,11 +76,11 @@
+ {
+ 	struct psk31 *s = (struct psk31 *) trx->modem;
+ 	double phase, error;
+ 	int bits, n;
+ 
+-	if ((phase = carg(ccor(s->prevsymbol, symbol))) < 0)
++	if ((phase = c_arg(ccor(s->prevsymbol, symbol))) < 0)
+ 		phase += 2 * M_PI;
+ 
+ 	if (s->qpsk) {
+ 		bits = ((int) (phase / M_PI_2 + 0.5)) & 3;
+ 		n = 4;
+diff -NrU5 gmfsk-0.6.original/src/rtty/rttyrx.c gmfsk-0.6/src/rtty/rttyrx.c
+--- gmfsk-0.6.original/src/rtty/rttyrx.c	2009-07-20 15:49:08.000000000 +0000
++++ gmfsk-0.6/src/rtty/rttyrx.c	2009-07-20 15:55:38.000000000 +0000
+@@ -209,11 +209,11 @@
+ 		n = fftfilt_run(s->fftfilt, z, &zp);
+ 
+ 		for (i = 0; i < n; i++) {
+ 			static complex prev;
+ 
+-			f = carg(ccor(prev, zp[i])) * SampleRate / (2 * M_PI);
++			f = c_arg(ccor(prev, zp[i])) * SampleRate / (2 * M_PI);
+ 			prev = zp[i];
+ 
+ 			f = bbfilt(s, f);
+ 			s->pipe[s->pipeptr] = f;
+ 			s->pipeptr = (s->pipeptr + 1) % s->symbollen;
+diff -NrU5 gmfsk-0.6.original/src/throb/throbrx.c gmfsk-0.6/src/throb/throbrx.c
+--- gmfsk-0.6.original/src/throb/throbrx.c	2009-07-20 15:49:08.000000000 +0000
++++ gmfsk-0.6/src/throb/throbrx.c	2009-07-20 15:56:26.000000000 +0000
+@@ -161,11 +161,11 @@
+ 		double f;
+ 
+ 		z1 = rxword[maxtone];
+ 		z2 = cmac(s->rxtone[maxtone], s->symbol, s->symptr + 2, s->rxsymlen);
+ 
+-		f = carg(ccor(z1, z2)) / (2 * DownSample * M_PI / SampleRate);
++		f = c_arg(ccor(z1, z2)) / (2 * DownSample * M_PI / SampleRate);
+ 		f -= s->freqs[maxtone];
+ 
+ 		trx_set_freq(trx->frequency + f / 8.0);
+ 	}
+ 
diff --git a/media-radio/gmfsk/gmfsk-0.6-r1.ebuild b/media-radio/gmfsk/gmfsk-0.6-r1.ebuild
index 847ebd0bbb9b..b2f628e32a59 100644
--- a/media-radio/gmfsk/gmfsk-0.6-r1.ebuild
+++ b/media-radio/gmfsk/gmfsk-0.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/gmfsk/gmfsk-0.6-r1.ebuild,v 1.5 2006/11/18 04:43:11 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/gmfsk/gmfsk-0.6-r1.ebuild,v 1.6 2009/07/20 16:38:39 vostorga Exp $
 
 inherit eutils gnome2
 
@@ -29,7 +29,7 @@ DOCS="AUTHORS COPYING COPYING-DOCS ChangeLog INSTALL NEWS README"
 
 src_unpack(){
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-patch-mt63_dsp.h || \
-		die "epatch failed"
+	cd "${S}"
+	epatch "${FILESDIR}"/"${PN}"-patch-mt63_dsp.h
+	epatch "${FILESDIR}"/"${P}"-gcc44.patch
 }