Date: Fri, 3 Dec 2021 01:19:18 GMT From: Diane Bruce <db@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8e39e791b0a9 - main - comms/hamlib: Major updates needed for other programs Message-ID: <202112030119.1B31JIQJ089766@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by db: URL: https://cgit.FreeBSD.org/ports/commit/?id=8e39e791b0a924a214da86bc4808dacb7d114393 commit 8e39e791b0a924a214da86bc4808dacb7d114393 Author: Diane Bruce <db@FreeBSD.org> AuthorDate: 2021-12-03 00:53:00 +0000 Commit: Diane Bruce <db@FreeBSD.org> CommitDate: 2021-12-03 00:53:00 +0000 comms/hamlib: Major updates needed for other programs "it is necessary to update https://github.com/Hamlib/Hamlib/releases/tag/4.3.1 for the functioning of new programs like wsjtz / wsjtx / cqrlog / fldigi tks lu9dce" From Hamlib NEWS Hamlib -- History of visible changes. Copyright (C) 2000-2003 Frank Singleton Copyright (C) 2000-2021 Stephane Fillod, and others Copyright (C) 2000-2021 Michael Black W9MDB, and others Please send Hamlib bug reports to hamlib-developer@lists.sourceforge.net Version 4.3.1 * 2021-09-14 * Bug fix release - Do not do vfo_fixup on satmode rigs - Fix compilation of misc.c with gmtime_r replacement function for mingw - Fix python build. For some reason casting tp vfo_t in the RIG_VFO_N macro broke the swig parsing - Append the missing information to build hamlib v4.3 for Android NDK - Change set_icom_set_mode_with_data to not change mode unless necessary - Since Icom rigs default to filter 2 if a filter is not selected we will do the same when turning on data mode - Fix segfault in kenwood_set_vfo - scripts: Update example in readme, since 4.0 817 is 1020 - Make testlibusb.c compatible with libusb < 1.0.23 Note: On systems with libusb < 1.0.23 a warning will be emmitted but compliation should proceed without error. - Update testlibusb.c warning to "may be" instead of "will be" - Change kenwood to only set VFOA default on 1st rig_open call Version 4.3 * 2021-09-01 * libusb-1.0.23 or greater is now required or use --without-libusb * Generating documentation now requires GNU source-highlighter. * Added IC-575 * Less VFO swapping of newer Icom rigs -- zero swapping in WSJTX and JTDX * Dual rotator control in rotctl -R option * Started work on simulators -- very crude right now but usable to debug some things * Overhaul of rig split -- reverse split (VFOA=RX VFOB=TX) should work for rigs capable of it Starting VFO does not matter -- rig will end up on RX VFO S VFOA 1 VFOB S VFOB 1 VFOA S Main 1 Sub S Sub 1 Main Version 4.2 * 2021-05-17 * New rig_get_mode_bandwidths -- returns token set for bandwidths for given mode Rig command: \get_mode_bandwidths CW Mode=CW Normal=500Hz Narrow=50Hz Wide=2400Hz * New rig_get_info -- returns token set for all vfos where order does not matter This is a string return to allow for easy future expansion without changing the API New tokens may be introduced and can be skipped if not used by clients Rig command: \get_rig_info VFO=Main Freq=145000000 Mode=None Width=0 RX=1 TX=1 VFO=VFOB Freq=145000000 Mode=FM Width=15000 RX=0 TX=0 Split=0 SatMode=0 Rig=Dummy App=Hamlib Version=20210429 CRC=0xf49f4708 * New rig_get_vfo_info Rig command: \get_vfo_info VFOA Freq: 145000000 Mode: None Width: 0 Split: 0 SatMode: 0 * FILPATHLEN has changed to HAMLIB_FILPATHLEN * USRP lib and gnuradio are deprecated and will be removed in 5.0 * Added Radan rotator * Added Malachite SDR * Major rework for PRM80 * Add twiddle_timeout and twiddle_rit --set-conf options rigctld --set-conf=twiddle_timeout=5,twiddle_rit=1 This will set the twiddle timeout to 5 seconds and turn on twiddle_rit For twiddle timeout VFOB will not be polled for 5 seconds after VFO twiddling is detected * rigctld --twiddle is deprecated and will be removed in 5.0 along with get_twiddle and set_twiddle * Rework Doxygen manual including default layout for Doxygen 1.9.1. So far the amplifier, rotator, and utilities API sections have been updated. The rig (radio) section remains to be updated. Version 4.1 2021-01-31 * rigctld and rigs should be more robust for disconnect problems * Several fixes for Icom and Yaesu rigs * Nobody should need to use rig->caps or rig->state anymore If you need a variable added please contact us. Note that rig->state abstraction is not implemented yet...no need known * New rig_get_caps_int and rig_get_caps_cptr functions to replace using caps-> values * New rig_get_function to replace using caps-> function pointers * Fix shared library problem with WSJTX, JTDX, and JS8Call * New model Barrett 950 Version 4.0 2020-11-29 * API/ABI changes, advance ABI to 4 0 0. * Add GPIO and GPION options for DCD. Jeroen Vreeken * New backend: ELAD FDM DUO. Giovanni, HB9EIK. * New RIG_LEVEL_RFPOWER_METER_WATTS level * All channel functions now take a vfo argument * New rotator backend: iOptron. Bob, KD8CGH * New model: Icom IC-R8600. Ekki, DF4OR * New utility: rigctlcom. Mike, W9MDB * New model: FT847UNI for unidirectional early serial numbers. Mike, W9MDB * Remove GNU Texinfo files and build system dependency. * Rig model numbers have changed to allow future growth * Fix a lot of static code analysis errors and warnings. Mike, W9MDB * Rearrange directory structure to put rigs and rotators sources under their own subdirectories. Mike, W9MDB * rig_get_channel changed to add read_only flag. * rigctl(d) f command also returns VFO now. * caching of vfo, frequency, mode, and ptt speeds up rigctld for all. * caching of kenwood/yaesu "IF" speeds up polling from WSJTX/JTDX. * rig_get_channel now has read_only flag but it still needs to be implemented based on rig behavior, so if you use rig_get_channel you may get a RIG_ENIMPL error to contact us for fixing it. * New rig backend for Elecraft K4. * New rig backend for PowerSDR (Flex and Apache users). * Many fixes and enhancements. Mike, W9MDB and many contributors * PTT port is no longer shared by default, use --set-conf=ptt_share=1 to enable PR: ports/260065 Reported by: castilloeduardo@outlook.com.ar --- comms/hamlib/Makefile | 17 ++++---- comms/hamlib/distinfo | 6 +-- comms/hamlib/files/patch-tests_testlibusb.c | 29 +++++++++++++ comms/hamlib/pkg-plist | 64 ++++++++++++++++------------- 4 files changed, 76 insertions(+), 40 deletions(-) diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile index 69ea260d913d..930e75863b7e 100644 --- a/comms/hamlib/Makefile +++ b/comms/hamlib/Makefile @@ -1,8 +1,7 @@ # Created by: Sebastian Yepes <esn@x123.info> PORTNAME= hamlib -PORTVERSION= 3.3 -PORTREVISION= 2 +PORTVERSION= 4.3.1 CATEGORIES= comms hamradio MASTER_SITES= SF @@ -14,7 +13,7 @@ LICENSE= LGPL20 BUILD_DEPENDS= swig:devel/swig LIB_DEPENDS= libltdl.so:devel/libltdl -USES= autoreconf gnome libtool:keepla pathfix perl5 pkgconfig python \ +USES= autoreconf gnome libtool:keepla localbase:ldflags pathfix perl5 pkgconfig python \ readline shebangfix tcl USE_PYTHON= py3kplist USE_PERL5= build run @@ -29,17 +28,16 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-perl-binding \ --with-tcl-binding --with-tcl=${TCL_LIBDIR} \ --with-libusb \ - --with-python-binding --without-rigmatrix + --with-python-binding CONFIGURE_ENV= LIBUSB_LIBS="-lusb" PLIST_SUB= VER=${PORTVERSION} TCL_VER=${TCL_VER} INSTALL_TARGET= install-strip -INFO= hamlib OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|g' \ - ${WRKSRC}/bindings/Makefile.am + @${REINPLACE_CMD} -e 's|python3-config|${PYTHON_CMD}-config|g' \ + ${WRKSRC}/macros/ax_python_devel.m4 post-build: ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' \ ${STAGEDIR}${WRKSRC}/bindings/Hamlib-pl.mk @@ -49,8 +47,9 @@ post-install: .for d in ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB \ ${WRKSRC}/ChangeLog ${WRKSRC}/INSTALL ${WRKSRC}/LICENSE \ ${WRKSRC}/NEWS ${WRKSRC}/PLAN ${WRKSRC}/README \ - ${WRKSRC}/README.betatester ${WRKSRC}/README.win32 \ - ${WRKSRC}/THANKS + ${WRKSRC}/README.betatester ${WRKSRC}/README.osx \ + ${WRKSRC}/README.developer ${WRKSRC}/README.freqranges \ + ${WRKSRC}/README.multicast ${WRKSRC}/THANKS ${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR} .endfor diff --git a/comms/hamlib/distinfo b/comms/hamlib/distinfo index e2a13649d1d6..a9cb510661ea 100644 --- a/comms/hamlib/distinfo +++ b/comms/hamlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551232323 -SHA256 (hamlib-3.3.tar.gz) = c90b53949c767f049733b442cd6e0a48648b55d99d4df5ef3f852d985f45e880 -SIZE (hamlib-3.3.tar.gz) = 2192119 +TIMESTAMP = 1636328018 +SHA256 (hamlib-4.3.1.tar.gz) = 3437386dfdd2314f108cf35f1527b20d784256b76633d216a50de94f4045a730 +SIZE (hamlib-4.3.1.tar.gz) = 2356944 diff --git a/comms/hamlib/files/patch-tests_testlibusb.c b/comms/hamlib/files/patch-tests_testlibusb.c new file mode 100644 index 000000000000..8926f15ffe7e --- /dev/null +++ b/comms/hamlib/files/patch-tests_testlibusb.c @@ -0,0 +1,29 @@ +--- tests/testlibusb.c 2021-11-30 22:59:53.050103000 -0500 ++++ tests/testlibusb.c 2021-11-30 23:03:26.187330000 -0500 +@@ -113,7 +113,9 @@ + printf(" wSpeedSupported: %u\n", ss_usb_cap->wSpeedSupported); + printf(" bFunctionalitySupport: %u\n", ss_usb_cap->bFunctionalitySupport); + printf(" bU1devExitLat: %u\n", ss_usb_cap->bU1DevExitLat); ++#if !defined(__FreeBSD__) + printf(" bU2devExitLat: %u\n", ss_usb_cap->bU2DevExitLat); ++#endif + } + + static void print_bos(libusb_device_handle *handle) +@@ -131,6 +133,7 @@ + + printf(" Binary Object Store (BOS):\n"); + printf(" wTotalLength: %u\n", bos->wTotalLength); ++#if !defined(__FreeBSD__) + printf(" bNumDeviceCaps: %u\n", bos->bNumDeviceCaps); + + for (i = 0; i < bos->bNumDeviceCaps; i++) +@@ -168,7 +171,7 @@ + libusb_free_ss_usb_device_capability_descriptor(ss_dev_cap); + } + } +- ++#endif + libusb_free_bos_descriptor(bos); + } + diff --git a/comms/hamlib/pkg-plist b/comms/hamlib/pkg-plist index 33726f2a8773..4834fef645bb 100644 --- a/comms/hamlib/pkg-plist +++ b/comms/hamlib/pkg-plist @@ -1,10 +1,16 @@ +bin/ampctl +bin/ampctld bin/rigctl +bin/rigctlcom bin/rigctld bin/rigmem bin/rigsmtr bin/rigswr bin/rotctl bin/rotctld +include/hamlib/ampclass.h +include/hamlib/amplifier.h +include/hamlib/amplist.h include/hamlib/rig.h include/hamlib/rig_dll.h include/hamlib/rigclass.h @@ -15,29 +21,42 @@ include/hamlib/rotlist.h lib/libhamlib++.a lib/libhamlib++.la lib/libhamlib++.so -lib/libhamlib++.so.2 -lib/libhamlib++.so.2.1.3 -lib/libhamlib.so.2.1.3 +lib/libhamlib++.so.4 +lib/libhamlib++.so.4.0.3 lib/libhamlib.a lib/libhamlib.la lib/libhamlib.so -lib/libhamlib.so.2 -lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl-%%VER%%.so -lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.la -lib/tcl%%TCL_VER%%/Hamlib/pkgIndex.tcl -lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.a -lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.so -libdata/pkgconfig/hamlib.pc -share/aclocal/hamlib.m4 +lib/libhamlib.so.4 +lib/libhamlib.so.4.0.3 %%SITE_ARCH%%/Hamlib.pm %%SITE_ARCH%%/auto/Hamlib/Hamlib.so %%SITE_ARCH%%/perltest.pl %%PYTHON_SITELIBDIR%%/Hamlib.py -%%PYTHON_SITELIBDIR%%/Hamlib.pyc -%%PYTHON_SITELIBDIR%%/Hamlib.pyo %%PYTHON_SITELIBDIR%%/_Hamlib.a %%PYTHON_SITELIBDIR%%/_Hamlib.la %%PYTHON_SITELIBDIR%%/_Hamlib.so +%%PYTHON_SITELIBDIR%%/__pycache__/Hamlib%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/__pycache__/Hamlib%%PYTHON_EXT_SUFFIX%%.pyc +lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl-4.3.so +lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.a +lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.la +lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.so +lib/tcl%%TCL_VER%%/Hamlib/pkgIndex.tcl +libdata/pkgconfig/hamlib.pc +man/man1/ampctl.1.gz +man/man1/ampctld.1.gz +man/man1/rigctlcom.1.gz +man/man1/rigctl.1.gz +man/man1/rigctld.1.gz +man/man1/rigmem.1.gz +man/man1/rigsmtr.1.gz +man/man1/rigswr.1.gz +man/man1/rotctl.1.gz +man/man1/rotctld.1.gz +man/man7/hamlib-primer.7.gz +man/man7/hamlib-utilities.7.gz +man/man7/hamlib.7.gz +share/aclocal/hamlib.m4 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB @@ -49,21 +68,10 @@ share/aclocal/hamlib.m4 %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.betatester %%PORTDOCS%%%%DOCSDIR%%/README.developer -%%PORTDOCS%%%%DOCSDIR%%/README.win32 +%%PORTDOCS%%%%DOCSDIR%%/README.osx +%%PORTDOCS%%%%DOCSDIR%%/README.freqranges +%%PORTDOCS%%%%DOCSDIR%%/README.multicast %%PORTDOCS%%%%DOCSDIR%%/THANKS -%%PYTHON2%%%%PORTDOCS%%%%DOCSDIR%%/examples/pytest.py -%%PYTHON3%%%%PORTDOCS%%%%DOCSDIR%%/examples/py3test.py %%PORTDOCS%%%%DOCSDIR%%/examples/perltest.pl +%%PORTDOCS%%%%DOCSDIR%%/examples/py3test.py %%PORTDOCS%%%%DOCSDIR%%/examples/tcltest.tcl -%%PORTDOCS%%%%DOCSDIR%%/html/Hamlib_design.png -%%PORTDOCS%%%%DOCSDIR%%/html/hamlib.html -man/man1/rigctl.1.gz -man/man1/rigctld.1.gz -man/man1/rigmem.1.gz -man/man1/rigsmtr.1.gz -man/man1/rigswr.1.gz -man/man1/rotctl.1.gz -man/man1/rotctld.1.gz -man/man7/hamlib-primer.7.gz -man/man7/hamlib-utilities.7.gz -man/man7/hamlib.7.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112030119.1B31JIQJ089766>