mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00
Code Issues Releases Activity

Unbreak fldigi and update to latest version 3.23.15

Browse Source 
Move distribution site to sourceforge

Version 3.23.15 * Maintenance release
Translation file
 * Updated po/pl.po Polish translation file
 - update provided by Roman Bagiñski, SP4JEU

N3FJP command sequencing
 * changed command/response sequencing to correct
   difference in behavior Windows versus all other platforms.

BARTG vice BART
 * Acronymn correction on Contest configuration panel

speed test
 * improper use of memset

XP fault on failure
 * debug thread timing caused delayed attempt to access
   a deleted Fl_Browser widget in debug panel
   - not evident on other OS or on later versions of Windows

Default Logbook widget sizing
 * Added resizing to all logbook widgets

Mono / Stereo wav file
 * Output monophonic wav file (left channel) unless configured
   for right channel recording

ARQ thread
 * change server thread to make non blocking

N3FJP logged frequency
  * User selectable for ssb Suppressed carrier, or
    ssb Suppressed carrier +/- wf audio injection
    frequency modified if RTTY

update check
 * Use www.w1hkj.com file mirror for version check

DX cluster
 * Add DX cluster access via telnet connection

CQWW zone/state
 * Add parsing and auto log entry for CQzone when passed
   from CQWW's CALLTAB event
 * Fix error in not passing CQstate entry from both log views

Contest fields
 * remove ambiguity for menu items View ... Contest fields

OSX Clang build
 * Correct errors in clang build on OS X 10.11

flrig default
 * Change flrig control default to FALSE
This commit is contained in:
Diane Bruce 2016-11-09 23:04:59 +00:00
parent cbd730413c
commit f53ad28431
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=425816
17 changed files with 27 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
comms/fldigi/Makefile
View File

@ -1,10 +1,9 @@
# $FreeBSD$
PORTNAME= fldigi
PORTVERSION= 3.23.03
PORTVERSION= 3.23.15
CATEGORIES= comms hamradio
MASTER_SITES= http://www.w1hkj.com/downloads/fldigi/\
LOCAL/db
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Digital decoder for psk, cw, psk31, olivia
@ -18,8 +17,6 @@ LIB_DEPENDS= libsamplerate.so:audio/libsamplerate\
libboost_system.so:devel/boost-libs\
libfltk.so:x11-toolkits/fltk
BROKEN= Fails to build against libsamplerate-0.1.9
USE_CXXSTD= gnu++0x
GNU_CONFIGURE= yes
USES= compiler:c++11-lib execinfo gmake perl5 pkgconfig shebangfix

5
comms/fldigi/distinfo
View File

@ -1,2 +1,3 @@
SHA256 (fldigi-3.23.03.tar.gz) = b308ceb0581e7668eedf83042baf6f9ae4af938648436cd1857655cad8fe978e
SIZE (fldigi-3.23.03.tar.gz) = 2951727
TIMESTAMP = 1478699919
SHA256 (fldigi-3.23.15.tar.gz) = b55018b50f8ace203a633f23cab9b4b5a0c6e4bf6d0fcc1258de6497d274aadb
SIZE (fldigi-3.23.15.tar.gz) = 3138313

10
comms/fldigi/files/patch-src_dialogs_fl__digi.cxx
View File

@ -1,10 +0,0 @@
--- src/dialogs/fl_digi.cxx.orig 2015-09-29 12:58:57 UTC
+++ src/dialogs/fl_digi.cxx
@@ -26,6 +26,7 @@
#include <config.h>
#include <sys/types.h>
+#include <time.h>
#ifdef __WOE32__
# ifdef __CYGWIN__

11
comms/fldigi/files/patch-src_dominoex_dominoex.cxx
View File

@ -1,11 +0,0 @@
--- src/dominoex/dominoex.cxx.orig 2015-08-12 20:42:39 UTC
+++ src/dominoex/dominoex.cxx
@@ -63,7 +63,7 @@ void dominoex::tx_init(SoundBase *sc)
strSecXmtText = progdefaults.secText;
if (strSecXmtText.length() == 0)
- strSecXmtText = "fldigi "PACKAGE_VERSION" ";
+ strSecXmtText = "fldigi " PACKAGE_VERSION;
videoText();
}

49
comms/fldigi/files/patch-src_fsq_fsq.cxx
View File

@ -1,49 +0,0 @@
--- src/fsq/fsq.cxx.orig 2015-09-28 18:24:41 UTC
+++ src/fsq/fsq.cxx
@@ -1193,9 +1193,12 @@ int fsq::rx_process(const double *buf, i
&rx_stream[SHIFT_SIZE], // from
BLOCK_SIZE*sizeof(*rx_stream)); // # bytes
memset(fft_data, 0, sizeof(fft_data));
- for (int i = 0; i < BLOCK_SIZE; i++)
- fft_data[i].real() = fft_data[i].imag() =
- rx_stream[i] * a_blackman[i];
+ for (int i = 0; i < BLOCK_SIZE; i++) {
+ fft_data[i].real(
+ rx_stream[i] * a_blackman[i]);
+ fft_data[i].imag(
+ rx_stream[i] * a_blackman[i]);
+ }
fft->ComplexFFT(fft_data);
process_tones();
}
@@ -1423,7 +1426,7 @@ static string tx_text_queue = "";
static vector<string> commands;
#define NUMCOMMANDS 10
-static size_t next = 0;
+static size_t nexti = 0;
double fsq_xmtdelay() // in seconds
{
@@ -1440,9 +1443,9 @@ double fsq_xmtdelay() // in seconds
void fsq_repeat_last_command()
{
fsq_tx_text->clear();
- fsq_tx_text->addstr(sz2utf8(commands[next].c_str()));
- next++;
- if (next == commands.size()) next = 0;
+ fsq_tx_text->addstr(sz2utf8(commands[nexti].c_str()));
+ nexti++;
+ if (nexti == commands.size()) nexti = 0;
}
int get_fsq_tx_char(void)
@@ -1484,7 +1487,7 @@ void try_transmit(void *)
if (active_modem != fsq_modem) return;
if (!active_modem->fsq_squelch_open() && trx_state == STATE_RX) {
- next = 0;
+ nexti = 0;
fsq_que_clear();
//LOG_WARN("%s", "start_tx()");
start_tx();

18
comms/fldigi/files/patch-src_ifkp_ifkp.cxx
View File

@ -1,18 +0,0 @@
--- src/ifkp/ifkp.cxx.orig 2015-10-02 23:20:08 UTC
+++ src/ifkp/ifkp.cxx
@@ -580,9 +580,12 @@ int ifkp::rx_process(const double *buf,
&rx_stream[IFKP_SHIFT_SIZE], // from
IFKP_BLOCK_SIZE*sizeof(*rx_stream)); // # bytes
memset(fft_data, 0, sizeof(fft_data));
- for (int i = 0; i < IFKP_BLOCK_SIZE; i++)
- fft_data[i].real() = fft_data[i].imag() =
- rx_stream[i] * a_blackman[i];
+ for (int i = 0; i < IFKP_BLOCK_SIZE; i++) {
+ fft_data[i].real(
+ rx_stream[i] * a_blackman[i]);
+ fft_data[i].imag(
+ rx_stream[i] * a_blackman[i]);
+ }
fft->ComplexFFT(fft_data);
process_tones();
}

11
comms/fldigi/files/patch-src_include_data__io.h
View File

@ -1,11 +0,0 @@
--- src/include/data_io.h.orig 2015-08-12 20:42:40 UTC
+++ src/include/data_io.h
@@ -27,6 +27,8 @@
#ifndef fldigi_data_io_h
#define fldigi_data_io_h
+#include <sys/types.h> // For time_t
+
#define DEFAULT_ARQ_IP_ADDRESS "127.0.0.1"
#define DEFAULT_ARQ_IP_PORT "7322"

11
comms/fldigi/files/patch-src_include_main.h Normal file
View File

@ -0,0 +1,11 @@
--- src/include/main.h.orig 2016-08-07 11:40:50 UTC
+++ src/include/main.h
@@ -22,6 +22,8 @@
#define MAIN_H_
#include <config.h>
+// FreeBSD needs this
+#include <time.h>
#include <string>

10
comms/fldigi/files/patch-src_include_qrunner.h
View File

@ -1,10 +0,0 @@
--- src/include/qrunner.h.orig 2015-08-12 20:42:40 UTC
+++ src/include/qrunner.h
@@ -32,6 +32,7 @@
#include <cerrno>
#include <stdexcept>
#include <cstring>
+#include <string>
#if HAVE_STD_BIND
# include <functional>

11
comms/fldigi/files/patch-src_misc_newinstall.cxx
View File

@ -1,5 +1,14 @@
--- src/misc/newinstall.cxx.orig 2015-08-12 20:42:32 UTC
--- src/misc/newinstall.cxx.orig 2016-11-09 20:36:15 UTC
+++ src/misc/newinstall.cxx
@@ -67,7 +67,7 @@ text[3] = " btu <NAME> <CALL> de <MYCALL
label[4] = "SK @||";
text[4] = "\n\
-tnx fer QSO <NAME>, 73, God bless.\n\
+tnx fer QSO <NAME>, 73.\n\
<ZDT> <CALL> de <MYCALL> sk\n\
<RX>";
@@ -84,7 +84,7 @@ Age: \n\
Rig: \n\
Pwr: \n\

11
comms/fldigi/files/patch-src_qrunner_qrunner.cxx
View File

@ -1,11 +0,0 @@
--- src/qrunner/qrunner.cxx.orig 2015-08-12 20:42:38 UTC
+++ src/qrunner/qrunner.cxx
@@ -103,7 +103,7 @@ void qrunner::execute(int fd, void *arg)
return;
qr->inprog = true;
- size_t n = QRUNNER_READ(fd, rbuf, FIFO_SIZE);
+ ssize_t n = QRUNNER_READ(fd, rbuf, FIFO_SIZE);
switch (n) {
case -1:
if (!QRUNNER_EAGAIN()) {

20
comms/fldigi/files/patch-src_soundcard_sound.cxx
View File

@ -1,20 +0,0 @@
--- src/soundcard/sound.cxx.orig 2015-08-12 20:42:32 UTC
+++ src/soundcard/sound.cxx
@@ -689,7 +689,7 @@ size_t SoundOSS::Read(float *buffer, siz
for (size_t i = 0; i < buffersize; i++)
buffer[i] = src_buffer[2*i +
- progdefaults.ReverseRxAudio ? 1 : 0];
+ (progdefaults.ReverseRxAudio ? 1 : 0)];
#if USE_SNDFILE
if (capture)
@@ -724,7 +724,7 @@ size_t SoundOSS::Read(float *buffer, siz
for (int i = 0; i < numread; i++)
buffer[i] = snd_buffer[2*i +
- progdefaults.sig_on_right_channel ? 1 : 0];
+ (progdefaults.sig_on_right_channel ? 1 : 0)];
return numread;

11
comms/fldigi/files/patch-src_spot_pskrep.cxx
View File

@ -1,11 +0,0 @@
--- src/spot/pskrep.cxx.orig 2015-09-15 14:09:37 UTC
+++ src/spot/pskrep.cxx
@@ -50,7 +50,7 @@
#include <algorithm>
#include <fstream>
-#if GCC_VER_OK
+#if GCC_VER_OK || HAVE_STD_HASH
# if HAVE_STD_HASH
# define MAP_TYPE std::unordered_map
# define HASH_TYPE std::hash

11
comms/fldigi/files/patch-src_thor_thor.cxx
View File

@ -1,11 +0,0 @@
--- src/thor/thor.cxx.orig 2015-09-30 11:23:49 UTC
+++ src/thor/thor.cxx
@@ -63,7 +63,7 @@ void thor::tx_init(SoundBase *sc)
videoText();
strSecXmtText = progdefaults.THORsecText;
if (strSecXmtText.length() == 0)
- strSecXmtText = "fldigi "PACKAGE_VERSION" ";
+ strSecXmtText = "fldigi " PACKAGE_VERSION " ";
cptr = 0;
}

11
comms/fldigi/files/patch-src_wefax_wefax.cxx
View File

@ -1,11 +0,0 @@
--- src/wefax/wefax.cxx.orig 2015-09-12 20:02:06 UTC
+++ src/wefax/wefax.cxx
@@ -556,7 +556,7 @@ private:
= wf->powerDensity(m_carrier - 2 * m_apt_start_freq, bandwidth_apt_start)
+ wf->powerDensity(m_carrier - m_apt_start_freq, bandwidth_apt_start)
+ wf->powerDensity(m_carrier , bandwidth_apt_start)
- + wf->powerDensity(m_carrier + m_apt_start_freq, bandwidth_apt_start);
+ + wf->powerDensity(m_carrier + m_apt_start_freq, bandwidth_apt_start)
+ wf->powerDensity(m_carrier + 2 * m_apt_start_freq, bandwidth_apt_start);
return decayavg( avg_pwr, pwr, 10 );

2
comms/fldigi/files/patch-src_widgets_picture.cxx
View File

@ -1,4 +1,4 @@
--- src/widgets/picture.cxx.orig 2015-09-12 20:02:06 UTC
--- src/widgets/picture.cxx.orig 2016-09-18 12:35:58 UTC
+++ src/widgets/picture.cxx
@@ -40,6 +40,7 @@
#include <algorithm>

10
comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcBase64.h
View File

@ -1,10 +0,0 @@
--- src/xmlrpcpp/XmlRpcBase64.h.orig 2015-08-12 20:42:40 UTC
+++ src/xmlrpcpp/XmlRpcBase64.h
@@ -18,6 +18,7 @@
#if !defined(__BASE64_H_INCLUDED__)
#define __BASE64_H_INCLUDED__ 1
+#include <ios>
#include <iterator>
static