1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00

Version 4.1.08 * Maintenance release

- Greek translation files updated by Haris SV1GRB
 - xmlrpc <vector>
 . This reverts commit d681ab54b31100878e16bf2c8c2b9a96ceb2de23.
 . avoid sizing a zero length vector; use resize(size, n) for
   non empty return vector
 - Logbook
 . Fix lost / garbled records on Windows OS
 . Fix lost logbook, zero records on Windows OS
 - Documentation
 . Add missing deadman timer documentation
 - Raster init values
 . Raster::resize() was being called with a negative
   width or height due to bad state being stored in the
   config. This resulted in fldigi crashing before the
   UI was displayed.
  . submitted by Stephen Hurd <shurd@FreeBSD.org>
 - Image transmit docs
  . Correct manual for thor, mfsk, ifkp and fsk image transfer.
 - BSD soundcard
  . In FreeBSD sound devices e.g. /dev/dsp0.0 can only be open once
    whereas /dev/dsp0 can be open multiple times. fldigi tries
    to open /dev/dsp0.0 multiple times which fails.
    For specific sound card access, use /dev/dsp or /dev/dsp%d
 - RsID squelch open time
  . increase squelch open time to 300 seconds
 - N3FJP ACL
  . send logged frequency with other log info
  . enable setlocale(LC_ALL,"")

73, David, W1HKJ
This commit is contained in:
Diane Bruce 2019-08-14 21:58:57 +00:00
parent 586706be5a
commit 9eab30f2fb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=508975
5 changed files with 4 additions and 109 deletions

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= fldigi
PORTVERSION= 4.1.07
PORTVERSION= 4.1.08
CATEGORIES= comms hamradio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1565013442
SHA256 (fldigi-4.1.07.tar.gz) = dc4864b6e63c688b9dd932587bdaf7becfa17558380f7deff1236eb6b66921f0
SIZE (fldigi-4.1.07.tar.gz) = 4632923
TIMESTAMP = 1565818622
SHA256 (fldigi-4.1.08.tar.gz) = 004b54fa4ff03c85e088bf1706270db5f3976afcaaf1003b4d6d3b0ef8007349
SIZE (fldigi-4.1.08.tar.gz) = 4633597

View File

@ -1,43 +0,0 @@
--- src/soundcard/sound.cxx.orig 2019-05-25 01:35:59 UTC
+++ src/soundcard/sound.cxx
@@ -651,7 +651,26 @@ int SoundOSS::Open(int md, int freq)
oflags = oflags | O_CLOEXEC;
# endif
+#ifdef __FreeBSD__
+/*
+ * In FreeBSD sound devices e.g. /dev/dsp0.0 can only be open once
+ * whereas /dev/dsp0 can be open multiple times. fldigi tries
+ * to open /dev/dsp0.0 multiple times which fails. Also see man 4 sound.
+ * "For specific sound card access, please instead use /dev/dsp or /dev/dsp%d"
+ * This is a hack. XXX - db VA3DB
+ */
+ char *fixed_name;
+ char *p;
+ /* Look for a '.' if found, blow it away */
+ fixed_name = strdup(device.c_str());
+ p = strchr(fixed_name, '.');
+ if(p != NULL)
+ *p = '\0';
+ device_fd = fl_open(fixed_name, oflags, 0);
+ free(fixed_name);
+#else
device_fd = fl_open(device.c_str(), oflags, 0);
+#endif
if (device_fd == -1)
throw SndException(errno);
@@ -677,12 +696,11 @@ void SoundOSS::Close(unsigned dir)
void SoundOSS::getVersion()
{
version = 0;
-#ifndef __FreeBSD__
+
if (ioctl(device_fd, OSS_GETVERSION, &version) == -1) {
version = -1;
throw SndException("OSS Version");
}
-#endif
}
void SoundOSS::getCapabilities()

View File

@ -1,49 +0,0 @@
--- src/soundcard/soundconf.cxx.orig 2019-03-18 15:12:35 UTC
+++ src/soundcard/soundconf.cxx
@@ -53,6 +53,11 @@ double std_sample_rates[] = { 8000.0, 9600.0, 11025.0,
static void init_oss(void)
{
#if USE_OSS
+#ifdef __FreeBSD__
+ char *last = NULL;
+ char *curr = NULL;
+ char *p;
+#endif
glob_t gbuf;
glob("/dev/dsp*", 0, NULL, &gbuf);
if (gbuf.gl_pathc == 0) {
@@ -61,8 +66,33 @@ static void init_oss(void)
menuOSSDev->deactivate();
return;
}
- for (size_t i = 0; i < gbuf.gl_pathc; i++)
+ for (size_t i = 0; i < gbuf.gl_pathc; i++) {
+#ifdef __FreeBSD__
+ if (curr)
+ free(curr);
+ curr = strdup(gbuf.gl_pathv[i]);
+ p = strrchr(curr, '.');
+ if (p)
+ *p = '\0';
+ if (last != NULL) {
+ if (strcmp(last, curr) == 0)
+ continue;
+ }
+ menuOSSDev->add(curr);
+ if (last)
+ free(last);
+ last = curr;
+ curr = NULL;
+#else
menuOSSDev->add(gbuf.gl_pathv[i]);
+#endif
+ }
+#ifdef __FreeBSD__
+ if (last)
+ free(last);
+ if (curr)
+ free(curr);
+#endif
if (progdefaults.OSSdevice.length() == 0 && gbuf.gl_pathc)
progdefaults.OSSdevice = gbuf.gl_pathv[0];
menuOSSDev->value(progdefaults.OSSdevice.c_str());

View File

@ -1,13 +0,0 @@
--- src/waterfall/raster.cxx.orig 2018-02-24 13:42:49 UTC
+++ src/waterfall/raster.cxx
@@ -169,6 +169,10 @@ void Raster::resize(int x, int y, int w, int h)
while ((Ndest * rhs) < Hdest) Ndest++;
Ndest--;
+ if (Wdest < 0)
+ Wdest = 0;
+ if (Hdest < 0)
+ Hdest = 0;
unsigned char *tempbuf = new unsigned char [Wdest * Hdest];
unsigned char *oldbuf = vidbuf;