rpms/gmfsk/F-12 gmfsk-0.7pre1-gcc.patch,1.1,1.2 gmfsk.spec,1.3,1.4

Caolan McNamara caolanm at fedoraproject.org
Fri Jan 15 10:55:51 UTC 2010 

Author: caolanm

Update of /cvs/pkgs/rpms/gmfsk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv508/F-12

Modified Files:
	gmfsk-0.7pre1-gcc.patch gmfsk.spec 
Log Message:
Resolves: rhbz#511780 fix FTBFS

gmfsk-0.7pre1-gcc.patch:
 mfsk/mfskrx.c   |    4 ++--
 misc/cmplx.c    |    4 ++--
 misc/cmplx.h    |    4 ++--
 misc/misc.c     |    2 +-
 misc/misc.h     |    2 +-
 olivia/mfsk.h   |   10 +++++-----
 psk31/psk31rx.c |    2 +-
 rtty/rttyrx.c   |    2 +-
 snd.c           |    2 +-
 throb/throbrx.c |    2 +-
 10 files changed, 17 insertions(+), 17 deletions(-)

Index: gmfsk-0.7pre1-gcc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gmfsk/F-12/gmfsk-0.7pre1-gcc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gmfsk-0.7pre1-gcc.patch	2 Mar 2008 20:50:52 -0000	1.1
+++ gmfsk-0.7pre1-gcc.patch	15 Jan 2010 10:55:51 -0000	1.2
@@ -1,5 +1,5 @@
-diff -up gmfsk-0.7pre1/src/olivia/mfsk.h.gccfix gmfsk-0.7pre1/src/olivia/mfsk.h
---- gmfsk-0.7pre1/src/olivia/mfsk.h.gccfix	2005-01-20 14:38:06.000000000 -0600
+diff -up gmfsk-0.7pre1/src/olivia/mfsk.h gmfsk-0.7pre1/src/olivia/mfsk.h
+--- gmfsk-0.7pre1/src/olivia/mfsk.h	2005-01-20 14:38:06.000000000 -0600
 +++ gmfsk-0.7pre1/src/olivia/mfsk.h	2008-02-28 16:27:08.000000000 -0600
 @@ -1448,7 +1448,7 @@ class MFSK_Encoder
     void PrintOutputBlock(void)
@@ -42,3 +42,138 @@ diff -up gmfsk-0.7pre1/src/olivia/mfsk.h
  
     Seq<Type> InputBuffer;
  
+diff -ru gmfsk-0.7pre1/src/mfsk/mfskrx.c gmfsk-0.7pre1/src/mfsk/mfskrx.c
+--- gmfsk-0.7pre1/src/mfsk/mfskrx.c	2010-01-15 10:30:59.000000000 +0000
++++ gmfsk-0.7pre1/src/mfsk/mfskrx.c	2010-01-15 10:36:21.000000000 +0000
+@@ -56,7 +56,7 @@
+ {
+ 	struct mfsk *m = (struct mfsk *) trx->modem;
+ 
+-	m->picf += carg(ccor(m->prevz, z)) * SampleRate / (2.0 * M_PI);
++	m->picf += misc_carg(ccor(m->prevz, z)) * SampleRate / (2.0 * M_PI);
+ 	m->prevz = z;
+ 
+ 	if ((m->counter % SAMPLES_PER_PIXEL) == 0) {
+@@ -311,7 +311,7 @@
+ 		return;
+ 
+ 	z = ccor(m->prev1vector, m->currvector);
+-	x = carg(z) / m->symlen / (2.0 * M_PI / SampleRate);
++	x = misc_carg(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 -ru gmfsk-0.7pre1/src/misc/cmplx.c gmfsk-0.7pre1/src/misc/cmplx.c
+--- gmfsk-0.7pre1/src/misc/cmplx.c	2010-01-15 10:30:59.000000000 +0000
++++ gmfsk-0.7pre1/src/misc/cmplx.c	2010-01-15 10:35:39.000000000 +0000
+@@ -135,7 +135,7 @@
+ /*
+  * Argument of a complex number.
+  */
+-double carg(complex x)
++double misc_carg(complex x)
+ {
+ 	return atan2(c_im(x), c_re(x));
+ }
+@@ -143,7 +143,7 @@
+ /*
+  * Complex square root.
+  */
+-complex csqrt(complex x)
++complex misc_csqrt(complex x)
+ {
+ 	complex z;
+ 
+diff -ru gmfsk-0.7pre1/src/misc/cmplx.h gmfsk-0.7pre1/src/misc/cmplx.h
+--- gmfsk-0.7pre1/src/misc/cmplx.h	2010-01-15 10:30:59.000000000 +0000
++++ gmfsk-0.7pre1/src/misc/cmplx.h	2010-01-15 10:35:46.000000000 +0000
+@@ -150,7 +150,7 @@
+ /*
+  * Argument of a complex number.
+  */
+-extern __inline__ double carg(complex x)
++extern __inline__ double misc_carg(complex x)
+ {
+ 	return atan2(c_im(x), c_re(x));
+ }
+@@ -158,7 +158,7 @@
+ /*
+  * Complex square root.
+  */
+-extern __inline__ complex csqrt(complex x)
++extern __inline__ complex misc_csqrt(complex x)
+ {
+ 	complex z;
+ 
+diff -ru gmfsk-0.7pre1/src/misc/misc.c gmfsk-0.7pre1/src/misc/misc.c
+--- gmfsk-0.7pre1/src/misc/misc.c	2010-01-15 10:30:59.000000000 +0000
++++ gmfsk-0.7pre1/src/misc/misc.c	2010-01-15 10:31:59.000000000 +0000
+@@ -105,7 +105,7 @@
+ /*
+  * Integer base-2 logarithm
+  */
+-guint log2(guint x)
++guint misc_log2(guint x)
+ {
+ 	int y = 0;
+ 
+diff -ru gmfsk-0.7pre1/src/misc/misc.h gmfsk-0.7pre1/src/misc/misc.h
+--- gmfsk-0.7pre1/src/misc/misc.h	2010-01-15 10:30:59.000000000 +0000
++++ gmfsk-0.7pre1/src/misc/misc.h	2010-01-15 10:31:53.000000000 +0000
+@@ -107,7 +107,7 @@
+ /*
+  * Integer base-2 logarithm
+  */
+-extern inline guint log2(guint x)
++extern inline guint misc_log2(guint x)
+ {
+ 	int y = 0;
+ 
+diff -ru gmfsk-0.7pre1/src/psk31/psk31rx.c gmfsk-0.7pre1/src/psk31/psk31rx.c
+--- gmfsk-0.7pre1/src/psk31/psk31rx.c	2010-01-15 10:30:59.000000000 +0000
++++ gmfsk-0.7pre1/src/psk31/psk31rx.c	2010-01-15 10:36:13.000000000 +0000
+@@ -78,7 +78,7 @@
+ 	double phase, error;
+ 	int bits, n;
+ 
+-	if ((phase = carg(ccor(s->prevsymbol, symbol))) < 0)
++	if ((phase = misc_carg(ccor(s->prevsymbol, symbol))) < 0)
+ 		phase += 2 * M_PI;
+ 
+ 	if (s->qpsk) {
+diff -ru gmfsk-0.7pre1/src/rtty/rttyrx.c gmfsk-0.7pre1/src/rtty/rttyrx.c
+--- gmfsk-0.7pre1/src/rtty/rttyrx.c	2010-01-15 10:30:59.000000000 +0000
++++ gmfsk-0.7pre1/src/rtty/rttyrx.c	2010-01-15 10:36:26.000000000 +0000
+@@ -211,7 +211,7 @@
+ 		for (i = 0; i < n; i++) {
+ 			static complex prev;
+ 
+-			f = carg(ccor(prev, zp[i])) * SampleRate / (2 * M_PI);
++			f = misc_carg(ccor(prev, zp[i])) * SampleRate / (2 * M_PI);
+ 			prev = zp[i];
+ 
+ 			f = bbfilt(s, f);
+diff -ru gmfsk-0.7pre1/src/snd.c gmfsk-0.7pre1/src/snd.c
+--- gmfsk-0.7pre1/src/snd.c	2010-01-15 10:30:59.000000000 +0000
++++ gmfsk-0.7pre1/src/snd.c	2010-01-15 10:33:58.000000000 +0000
+@@ -237,7 +237,7 @@
+ 	config.samplerate = sndparam;
+ 
+ 	/* Try to get ~100ms worth of samples per fragment */
+-	sndparam = log2(config.samplerate * 100 / 1000);
++	sndparam = misc_log2(config.samplerate * 100 / 1000);
+ 
+ 	/* double if we are using 16 bit samples */
+ 	if (!(config.flags & SND_FLAG_8BIT))
+diff -ru gmfsk-0.7pre1/src/throb/throbrx.c gmfsk-0.7pre1/src/throb/throbrx.c
+--- gmfsk-0.7pre1/src/throb/throbrx.c	2010-01-15 10:30:59.000000000 +0000
++++ gmfsk-0.7pre1/src/throb/throbrx.c	2010-01-15 10:36:16.000000000 +0000
+@@ -163,7 +163,7 @@
+ 		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 = misc_carg(ccor(z1, z2)) / (2 * DownSample * M_PI / SampleRate);
+ 		f -= s->freqs[maxtone];
+ 
+ 		trx_set_freq(trx->frequency + f / 8.0);


Index: gmfsk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmfsk/F-12/gmfsk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gmfsk.spec	25 Jul 2009 00:27:37 -0000	1.3
+++ gmfsk.spec	15 Jan 2010 10:55:51 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gmfsk
 Version:        0.7
-Release:        0.7.pre1%{?dist}
+Release:        0.8.pre1%{?dist}
 Summary:        A Gnome Multimode HF Terminal for Ham Radio
 
 Group:          Applications/Communications
@@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Fri Jan 15 2010 Caolán McNamara <caolanm at redhat.com> - 0.7-0.8.pre1
+- Resolves: rhbz#511780 fix FTBFS
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-0.7.pre1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

More information about the scm-commits mailing list