Skip to content

Commit

Permalink
comms/wsjtx: Update to 2.5.2
Browse files Browse the repository at this point in the history
- Repair a  longstanding regression  that caused signal  reports from
  tail-ended Tx2 messages to be omitted from logged information

- Parse   "dx-call-1 RR73; dx-call-2 <de-call> +nn"  messages  (i3=0,
  n3=1 DXpedition mode) in regular 77-bit modes

- Repair a regression  associated with setting the  main window width
  on program startup.

- Repair a problem with Q65 decodes  of type 'q3' for messages of the
  form "<Call_1> Call_2"

- Execute code associated with Q65 decodes of type 'q5' only when the
  Max   Drift   control   is   set  to   50.    This   fix   prevents
  double-incrementing of  the message averaging counter  on the first
  decoding sequence.

- Polarization offset 'Dpol' from the astronomical data window is now
  written    to    file     azel.dat    if    environment    variable
  WSJT_AZEL_EXTRA_LINES has  been defined as  1 or greater.   Dpol is
  especially useful for EME on the higher microwave bands.

- The Auto  Log QSO option  in "Settings->Reporting" now  behaves the
  same  as  the Prompt  to  log  QSO option  when  not  in a  special
  operating context mode.

- The Fast/Normal/Deep  setting in  Q65 mode is  now a sticky setting
  and is no longer reset to Fast on program startup or  when Settings
  has  been opened. The user selection is used for automatic decodes,
  but Deep is used for any subsequent manual decode attempts.

- New hamlib code to correct minor flaws in controlling several rigs.

- Update  the  Chinese  and  Hong   Kong  translations  of  the  user
  interface.

PR:		ports/260618
Reported by:	hellocodebsd@gmail.com
  • Loading branch information
Diane Bruce authored and Diane Bruce committed Dec 31, 2021
1 parent 2b4cfc8 commit 9c3c365
Show file tree
Hide file tree
Showing 6 changed files with 259 additions and 133 deletions.
36 changes: 27 additions & 9 deletions comms/wsjtx/Makefile
@@ -1,6 +1,5 @@
PORTNAME= wsjtx
DISTVERSION= 2.1.2
PORTREVISION= 3
DISTVERSION= 2.5.2
CATEGORIES= comms hamradio
MASTER_SITES= SF/wsjt/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}

Expand All @@ -13,21 +12,21 @@ BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor \
autoconf>=2.69:devel/autoconf \
automake>=1.16.1:devel/automake \
a2x:textproc/asciidoc \
git:devel/git \
libtool:devel/libtool \
${LOCALBASE}/share/xsl/docbook:textproc/docbook-xsl
LIB_DEPENDS= libfftw3.so:math/fftw3 \
libfftw3f.so:math/fftw3-float \
libboost_log_setup.so:devel/boost-libs \
libxslt.so:textproc/libxslt

USES= cmake compiler:c++11-lib fortran gl \
makeinfo pkgconfig qt:5 tar:tgz
USES= cmake:noninja compiler:c++11-lang fortran gl libedit \
makeinfo pkgconfig qt:5 readline tar:tgz
USE_GL= glu
USE_QT= core gui network widgets \
multimedia concurrent printsupport serialport sql sql-sqlite3 \
buildtools_build linguisttools_build qmake_build
buildtools_build linguisttools_build qmake_build testlib

CMAKE_ARGS+= -DCMAKE_PREFIX_PATH+=${LOCALBASE}/wsjtx/lib \
-DLOCALBASE::STRING="${LOCALBASE}"
# for detailed debugging uncomment the next line
#CMAKE_ARGS+= --debug-output --trace
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
Expand All @@ -41,6 +40,23 @@ _PATCHES= wsjtx.patch hamlib.patch
FFLAGS+= -fallow-argument-mismatch
.endif

_HAMLIB_PATCHES= configure.ac hamlib.pc.in tests/rigtestlibusb.c
make-hamlib-patch:
${MV} ${FILESDIR}/hamlib.patch ${FILESDIR}/hamlib.patch.old
. for f in ${_HAMLIB_PATCHES}
(cd ${WRKDIR}/.build/hamlib-prefix/src;diff -u hamlib/$f.orig hamlib/$f >> ${FILESDIR}/hamlib.patch || true)
. endfor

_WSJTX_PATCHES= CMakeLists.txt Radio.cpp widgets/FrequencyLineEdit.cpp \
widgets/FrequencyDeltaLineEdit.cpp \
CMake/Modules/FindUsb.cmake \
CMake/Modules/FindHamlib.cmake
make-wsjtx-patch:
${MV} ${FILESDIR}/wsjtx.patch ${FILESDIR}/wsjtx.patch.old
. for f in ${_WSJTX_PATCHES}
(cd ${WRKDIR}/.build/wsjtx-prefix/src;diff -u wsjtx/$f.orig wsjtx/$f >> ${FILESDIR}/wsjtx.patch || true)
. endfor

post-patch:
. for _patch in ${_PATCHES}
# Keep a copy of the blank patch for the post-build target below
Expand All @@ -60,8 +76,10 @@ do-install:
(cd ${CONFIGURE_WRKSRC};${MAKE} -f Makefile DESTDIR=${STAGEDIR} install)

post-install:
.for f in fcal fmeasure fmtave ft8code jt4code jt65code jt9 jt9code \
message_aggregator msk144code qra64code qra64sim udp_daemon wsjtx wsprd
.for f in fcal fmeasure fmtave fst4sim ft8code jt4code jt65code jt9 jt9code \
message_aggregator msk144code rigctld-wsjtx rigctlcom-wsjtx \
rigctl-wsjtx udp_daemon q65code q65sim \
wsjtx wsjtx_app_version wsprd
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
.endfor

Expand Down
6 changes: 3 additions & 3 deletions comms/wsjtx/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1578066901
SHA256 (wsjtx-2.1.2.tgz) = d4af8703abc0295bd1242a0707013708f3f2543841656af8961c4bd9cbe3432a
SIZE (wsjtx-2.1.2.tgz) = 44928980
TIMESTAMP = 1640351546
SHA256 (wsjtx-2.5.2.tgz) = e0a4896217d4c9af271f5293b19ec94608742a729daab8127e87ec8d6697eff3
SIZE (wsjtx-2.5.2.tgz) = 25246974
60 changes: 47 additions & 13 deletions comms/wsjtx/files/hamlib.patch
@@ -1,28 +1,62 @@
--- hamlib/configure.ac.orig 2019-02-24 18:41:47.000000000 -0500
+++ hamlib/configure.ac 2019-04-15 12:40:39.767084000 -0400
@@ -270,7 +270,7 @@
--- hamlib/configure.ac.orig 2021-11-03 20:39:16.000000000 -0400
+++ hamlib/configure.ac 2021-12-28 12:12:44.629890000 -0500
@@ -269,7 +269,7 @@
dnl The host_os variable is set by the AC_CANONICAL_HOST macro above.
AS_CASE(["$host_os"],
[freebsd*], [
- AM_CPPFLAGS="-I/usr/local/include ${AM_CPPFLAGS}"
+ AM_CPPFLAGS="${AM_CPPFLAGS} -I/usr/local/include"
AM_LDFLAGS="${AM_LDFLAGS} -L/usr/local/lib"
AC_SUBST([AM_LDFLAGS])],
- AM_CPPFLAGS="-I/usr/local/include ${AM_CPPFLAGS}"
+ AM_CPPFLAGS="${AM_CPPFLAGS} -I/usr/local/include"
AM_LDFLAGS="${AM_LDFLAGS} -L/usr/local/lib"
AC_SUBST([AM_LDFLAGS])],

@@ -317,6 +317,7 @@

AC_MSG_RESULT([$cf_with_libusb])
AM_CONDITIONAL([HAVE_LIBUSB], [test x"${cf_with_libusb}" = "xyes"])

+LIBUSB_LIBS="-lusb"
LIBUSB=""
AC_ARG_VAR([LIBUSB_CFLAGS], [C compiler flags for libusb, overriding configure defaults])
AC_ARG_VAR([LIBUSB_LIBS], [linker flags for libusb, overriding configure check (useful for specifying static libusb-1.0.a (see INSTALL))])
--- hamlib/hamlib.pc.in.orig 2019-04-15 13:06:46.078042000 -0400
+++ hamlib/hamlib.pc.in 2019-04-15 13:06:59.695694000 -0400
@@ -9,5 +9,5 @@
--- hamlib/hamlib.pc.in.orig 2021-11-03 20:39:16.000000000 -0400
+++ hamlib/hamlib.pc.in 2021-12-28 12:19:09.120541000 -0500
@@ -7,7 +7,6 @@
Description: Library to control radio and rotator equipment.
URL: @PACKAGE_URL@
Version: @PACKAGE_VERSION@
Requires.private: @LIBUSB@
-Requires.private: @LIBUSB@
Cflags: -I${includedir} @PTHREAD_CFLAGS@
-Libs: -L${libdir} -lhamlib
-Libs.private: @MATH_LIBS@ @DL_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@
+Libs: -L${libdir} ${libdir}/libhamlib.a
Libs.private: @MATH_LIBS@ @DL_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@
+Libs.private: @MATH_LIBS@ @DL_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ -lusb
--- hamlib/tests/rigtestlibusb.c.orig 2021-11-03 20:39:16.000000000 -0400
+++ hamlib/tests/rigtestlibusb.c 2021-12-28 12:12:44.630778000 -0500
@@ -115,7 +115,10 @@
printf(" wSpeedSupported: %u\n", ss_usb_cap->wSpeedSupported);
printf(" bFunctionalitySupport: %u\n", ss_usb_cap->bFunctionalitySupport);
printf(" bU1devExitLat: %u\n", ss_usb_cap->bU1DevExitLat);
- printf(" bU2devExitLat: %u\n", ss_usb_cap->bU2DevExitLat);
+/*
+ * does not exist on FreeBSD libusb.h yet
+ * printf(" bU2devExitLat: %u\n", ss_usb_cap->bU2DevExitLat);
+ */
}

static void print_bos(libusb_device_handle *handle)
@@ -133,6 +136,7 @@

printf(" Binary Object Store (BOS):\n");
printf(" wTotalLength: %u\n", bos->wTotalLength);
+#if 0
printf(" bNumDeviceCaps: %u\n", bos->bNumDeviceCaps);

for (i = 0; i < bos->bNumDeviceCaps; i++)
@@ -170,7 +174,7 @@
libusb_free_ss_usb_device_capability_descriptor(ss_dev_cap);
}
}
-
+#endif
libusb_free_bos_descriptor(bos);
}

20 changes: 0 additions & 20 deletions comms/wsjtx/files/patch-CMakeLists.txt

This file was deleted.

0 comments on commit 9c3c365

Please sign in to comment.